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

Fix DCE

Browse source
This commit is contained in:
Lubos Lenco 2017-08-10 14:39:08 +02:00
parent f24324a903
commit 205ef2a766
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
blender/arm/exporter.py
View file

@ -2254,6 +2254,9 @@ class ArmoryExporter:
make_material.parse(mat, o, mat_users, mat_armusers, ArmoryExporter.renderpath_id)
self.output['material_datas'].append(o)
bpy.data.materials.remove(mat)
if bpy.data.worlds['Arm'].force_no_culling:
o['override_context'] = {}
o['override_context']['cull_mode'] = 'none'
def export_materials(self):
wrd = bpy.data.worlds['Arm']

10
blender/arm/write_data.py
View file

@ -86,6 +86,13 @@ project.addSources('Sources');
recastjs_path = recastjs_path.replace('\\', '/')
f.write(add_assets(recastjs_path))
if not is_publish:
f.write("""project.addParameter("--macro include('armory.trait')");\n""")
f.write("""project.addParameter("--macro include('armory.trait.internal')");\n""")
if import_logicnodes: # Live patching for logic nodes
f.write("""project.addParameter("--macro include('armory.logicnode')");\n""")
if enable_dce:
f.write("project.addParameter('-dce full');\n")
@ -95,9 +102,6 @@ project.addSources('Sources');
f.write("project.addParameter('" + import_traits[i] + "');\n")
f.write("""project.addParameter("--macro keep('""" + import_traits[i] + """')");\n""")
if import_logicnodes: # Live patching for logic nodes
f.write("""project.addParameter("--macro include('armory.logicnode')");\n""")
if state.is_render:
assets.add_khafile_def('arm_render')