maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1768 from MoritzBrueckner/fix-subpkg

Browse source 
Fix fetching scripts from sub-packages
This commit is contained in:
Lubos Lenco 2020-07-12 22:00:01 +02:00 committed by GitHub
parent 8bb94253d0 d18a9917aa
commit c765561ca6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
blender/arm/utils.py
View file

@ -398,17 +398,18 @@ def fetch_script_names():
wrd = bpy.data.worlds['Arm']
# Sources
wrd.arm_scripts_list.clear()
sources_path = get_fp() + '/Sources/' + safestr(wrd.arm_project_package)
sources_path = os.path.join(get_fp(), 'Sources', safestr(wrd.arm_project_package))
if os.path.isdir(sources_path):
os.chdir(sources_path)
# Glob supports recursive search since python 3.5 so it should cover both blender 2.79 and 2.8 integrated python
for file in glob.glob('**/*.hx', recursive=True):
mod = file.rsplit('.')[0]
mod = mod.replace('\\', '/')
mod_parts = mod.rsplit('/')
if re.match('^[A-Z][A-Za-z0-9_]*$',mod_parts[-1]):
wrd.arm_scripts_list.add().name = mod.replace(os.sep, '.')
if re.match('^[A-Z][A-Za-z0-9_]*$', mod_parts[-1]):
wrd.arm_scripts_list.add().name = mod.replace('/', '.')
fetch_script_props(file)
# Canvas
wrd.arm_canvas_list.clear()
canvas_path = get_fp() + '/Bundled/canvas'