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

Rebuild mat on instancing change

Browse source
This commit is contained in:
Lubos Lenco 2017-06-22 12:25:42 +02:00
parent 9ac648e49c
commit f981342101
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blender/arm/material/make_shadowmap.py
View file

@ -117,7 +117,7 @@ def make(context_id, rpasses):
vert.write('vcolor = col;')
# TODO: pass vbuf with proper struct
if gapi.startswith('direct3d'):
if gapi.startswith('direct3d') and bpy.data.worlds['Arm'].arm_deinterleaved_buffers == False:
vert.write('vec3 t1 = nor; // TODO: Temp for d3d')
if con_shadowmap.is_elem('tex'):
vert.write('vec2 t2 = tex; // TODO: Temp for d3d')

9
blender/arm/props.py
View file

@ -58,6 +58,13 @@ def invalidate_mesh_cache(self, context):
return
context.object.data.mesh_cached = False
def invalidate_instance_cache(self, context):
if context.object == None or context.object.data == None:
return
invalidate_mesh_cache(self, context)
for slot in context.object.material_slots:
slot.material.is_cached = False
def update_mat_cache(self, context):
if self.is_cached == True:
self.lock_cache = True
@ -230,7 +237,7 @@ def init_properties():
name="Graphics API", default='webgl', description='Based on currently selected target', update=update_gapi_html5)
# For object
bpy.types.Object.instanced_children = bpy.props.BoolProperty(name="Instanced Children", description="Use instaced rendering", default=False, update=invalidate_mesh_cache)
bpy.types.Object.instanced_children = bpy.props.BoolProperty(name="Instanced Children", description="Use instaced rendering", default=False, update=invalidate_instance_cache)
bpy.types.Object.instanced_children_loc_x = bpy.props.BoolProperty(name="X", default=True)
bpy.types.Object.instanced_children_loc_y = bpy.props.BoolProperty(name="Y", default=True)
bpy.types.Object.instanced_children_loc_z = bpy.props.BoolProperty(name="Z", default=True)