[Bf-blender-cvs] [944ac62] alembic: Fix alembic-cached dupli not updating in Render mode in 3DViews.
Bastien Montagne
noreply at git.blender.org
Mon Apr 20 21:03:01 CEST 2015
Commit: 944ac62ad16266cce859b65c5323418e0c852599
Author: Bastien Montagne
Date: Mon Apr 20 21:01:38 2015 +0200
Branches: alembic
https://developer.blender.org/rB944ac62ad16266cce859b65c5323418e0c852599
Fix alembic-cached dupli not updating in Render mode in 3DViews.
Probably a typo? Objects/parents sent to sync_mesh in case of dupli were meaningless...
===================================================================
M intern/cycles/blender/blender_mesh.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 654f401..dbb4d58 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -641,7 +641,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_parent, bool object_updated, bool hide
* so that individual per-dupli overrides are possible.
*/
MeshKey key = MeshKey(b_parent, b_ob);
- need_update = mesh_map.sync(&mesh, b_parent, PointerRNA_NULL, key);
+ need_update = mesh_map.sync(&mesh, b_ob, b_parent, key);
}
else {
BL::ID key = (BKE_object_is_modified(b_ob))? b_ob: b_ob_data;
More information about the Bf-blender-cvs
mailing list