Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2015-04-20 22:01:38 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-04-20 22:01:38 +0300
commit944ac62ad16266cce859b65c5323418e0c852599 (patch)
treec3cec5ba526d15e06a60543fab57e4a53d70ee27
parent734ee5a43ab40e7b64a8f28b349690830aa4f7c7 (diff)
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...
-rw-r--r--intern/cycles/blender/blender_mesh.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 654f401a8b5..dbb4d589651 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;