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

Fix py asset extension.

Browse source
This commit is contained in:
Lubos Lenco 2016-11-01 17:26:21 +01:00
parent dbd6517e10
commit d5513170aa
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blender/exporter.py
View file

@ -2463,7 +2463,7 @@ class ArmoryExporter:
log.print_info('Compiling ' + t.jsscript_prop + ' failed, check console')
os.chdir(cwd)
# Compiled file
assets.add('build/compiled/scripts/__javascript__/' + t.jsscript_prop + '.js')
assets.add('build/compiled/scripts/__javascript__/' + basename + '.js')
else:
# Write js to file
assetpath = 'build/compiled/scripts/' + t.jsscript_prop + '.js'

5
blender/make_utils.py
View file

@ -7,12 +7,13 @@ def kode_studio():
if armutils.get_os() == 'win':
kode_path = sdk_path + '/win32/Kode Studio.exe'
subprocess.Popen([kode_path, armutils.get_fp()], shell=True)
elif armutils.get_os() == 'mac':
kode_path = '"' + sdk_path + '/Kode Studio.app/Contents/MacOS/Electron"'
subprocess.Popen([kode_path + ' ' + armutils.get_fp()], shell=True)
else:
kode_path = sdk_path + '/linux64/kodestudio'
subprocess.Popen([kode_path, armutils.get_fp()], shell=True)
subprocess.Popen([kode_path, armutils.get_fp()], shell=True)
def def_strings_to_array(strdefs):
defs = strdefs.split('_')