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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-05-12 20:36:01 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-05-12 20:37:49 +0400
commit1b1b71f6970b54d70c99e9f616f93096df261e29 (patch)
treeef408b1f0c7d8ef475e478a6abe451a8c48d724b /intern/cycles/blender/blender_mesh.cpp
parent70303dfefe4ccd28434eb2804985b2b78652b65b (diff)
Fix T40149: cycles motion blur render problem with multiple render layers.
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
-rw-r--r--intern/cycles/blender/blender_mesh.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 83514879477..27ea552c6a7 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -616,6 +616,11 @@ void BlenderSync::sync_mesh_motion(BL::Object b_ob, Object *object, float motion
mesh_motion_synced.insert(mesh);
+ /* ensure we only motion sync meshes that also had mesh synced, to avoid
+ * unnecessary work and to ensure that its attributes were clear */
+ if(mesh_synced.find(mesh) == mesh_synced.end())
+ return;
+
/* for motion pass always compute, for motion blur it can be disabled */
int time_index = 0;