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

Merge pull request #2085 from MoritzBrueckner/fix-bundled-edit

Browse source 
Fix editing bundled traits if the project was never compiled
This commit is contained in:
Lubos Lenco 2021-01-09 12:46:46 +01:00 committed by GitHub
parent b7dc297d04 e742ca76c0
commit 70041fe2a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
blender/arm/props_traits.py
View file

@ -308,20 +308,24 @@ class ArmEditBundledScriptButton(bpy.types.Operator):
obj = bpy.context.scene
sdk_path = arm.utils.get_sdk_path()
project_path = arm.utils.get_fp()
pkg = arm.utils.safestr(bpy.data.worlds['Arm'].arm_project_package)
item = obj.arm_traitlist[obj.arm_traitlist_index]
source_hx_path = os.path.join(sdk_path , 'armory', 'Sources', 'armory', 'trait', item.class_name_prop + '.hx')
target_hx_path = os.path.join(project_path, 'Sources', pkg, item.class_name_prop + '.hx')
pkg = arm.utils.safestr(bpy.data.worlds['Arm'].arm_project_package)
source_hx_path = os.path.join(sdk_path, 'armory', 'Sources', 'armory', 'trait', item.class_name_prop + '.hx')
target_dir = os.path.join(project_path, 'Sources', pkg)
target_hx_path = os.path.join(target_dir, item.class_name_prop + '.hx')
if not os.path.isfile(target_hx_path):
if not os.path.exists(target_dir):
os.makedirs(target_dir)
# Rewrite package and copy
sf = open(source_hx_path, encoding="utf-8")
sf.readline()
tf = open(target_hx_path, 'w', encoding="utf-8")
tf.write('package ' + pkg + ';\n')
shutil.copyfileobj(sf, tf)
sf.close()
tf.close()
with open(source_hx_path, encoding="utf-8") as sf:
sf.readline()
with open(target_hx_path, 'w', encoding="utf-8") as tf:
tf.write('package ' + pkg + ';\n')
shutil.copyfileobj(sf, tf)
arm.utils.fetch_script_names()
# From bundled to script