Skip to content

Commit

Permalink
Merge branch 'dev_24_4' into 'dev'
Browse files Browse the repository at this point in the history
Merge dev_24_4 to dev

See merge request renderman/projects/RenderManForBlender!12
  • Loading branch information
Ian Hsieh committed Apr 22, 2022
2 parents 3d02391 + a8710c9 commit 8ee1447
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions rman_scene_sync.py
Expand Up @@ -618,7 +618,6 @@ def update_scene(self, context, depsgraph):
self.rman_scene.context = context

particle_settings_node = None
did_mesh_update = False # did the mesh actually update
prev_num_instances = self.rman_scene.num_object_instances # the number of instances previously

# Check the number of instances. If we differ, an object may have been
Expand Down Expand Up @@ -668,7 +667,6 @@ def update_scene(self, context, depsgraph):

elif isinstance(obj.id, bpy.types.Mesh):
rfb_log().debug("Mesh updated: %s" % obj.id.name)
did_mesh_update = True
'''
# Experimental code path. We can use context.blend_data.user_map to ask
# what objects use this mesh. We can then loop thru and call object_update on these
Expand Down Expand Up @@ -846,10 +844,6 @@ def update_scene(self, context, depsgraph):
self.update_particles.add(obj.id)

if not self.num_instances_changed:
if rman_type == 'MESH' and not did_mesh_update:
# if a mesh didn't actually update don't call obj_geometry_updated
rfb_log().debug("Skip object updated: %s" % obj.id.name)
continue
self._obj_geometry_updated(obj)

elif isinstance(obj.id, bpy.types.Collection):
Expand Down

0 comments on commit 8ee1447

Please sign in to comment.