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

Skip missing canvas

Browse source
This commit is contained in:
luboslenco 2018-06-15 12:25:53 +02:00
parent fbcb7b7bbe
commit 669cea082a
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
blender/arm/exporter.py
View file

@ -2513,10 +2513,18 @@ class ArmoryExporter:
group_name = arm.utils.safesrc(t.nodes_name_prop[0].upper() + t.nodes_name_prop[1:])
x['class_name'] = arm.utils.safestr(bpy.data.worlds['Arm'].arm_project_package) + '.node.' + group_name
elif t.type_prop == 'WebAssembly':
wpath = arm.utils.get_fp() + '/Bundled/' + t.webassembly_prop + '.wasm'
if not os.path.exists(wpath):
log.warn('Wasm "' + t.webassembly_prop + '" not found, skipping')
continue
x['type'] = 'Script'
x['class_name'] = 'armory.trait.internal.WasmScript'
x['parameters'] = ["'" + t.webassembly_prop + "'"]
elif t.type_prop == 'UI Canvas':
cpath = arm.utils.get_fp() + '/Bundled/canvas/' + t.canvas_name_prop + '.json'
if not os.path.exists(cpath):
log.warn('Canvas "' + t.canvas_name_prop + '" not found, skipping')
continue
ArmoryExporter.export_ui = True
x['type'] = 'Script'
x['class_name'] = 'armory.trait.internal.CanvasScript'

3
blender/arm/write_data.py
View file

@ -206,6 +206,9 @@ project.addSources('Sources');
if arm.utils.get_viewport_controls() == 'azerty':
assets.add_khafile_def('arm_azerty')
# if bpy.data.scenes[0].unit_settings.system_rotation == 'DEGREES':
# assets.add_khafile_def('arm_degrees')
assets.add_khafile_def('arm_fast')
# assets.add_khafile_def('arm_kha_' + arm.utils.get_kha_version())