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@pandora.be>2013-10-18 19:03:18 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-18 19:03:18 +0400
commit5a355c2b01a7b9688adcdd92637c9c06c2671b91 (patch)
tree8d4ebb1fbea3b8d9a0098a7dea894583ebe5c4bf /intern/cycles/blender/blender_mesh.cpp
parenta15818f1f7d3089d85d72a4196d0240d9f2f81d9 (diff)
Fix cycles hair segments not giving correct vector speed pass, the motion vector
export was not implemented yet for this primitive.
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
-rw-r--r--intern/cycles/blender/blender_mesh.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index f6c7319e210..e42af60c27b 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -488,7 +488,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tri
}
if(render_layer.use_hair)
- sync_curves(mesh, b_mesh, b_ob, object_updated);
+ sync_curves(mesh, b_mesh, b_ob, 0);
/* free derived mesh */
b_data.meshes.remove(b_mesh);
@@ -562,6 +562,10 @@ void BlenderSync::sync_mesh_motion(BL::Object b_ob, Mesh *mesh, int motion)
if(i != size || memcmp(M, &mesh->verts[0], sizeof(float3)*size) == 0)
mesh->attributes.remove(std);
+ /* hair motion */
+ if(render_layer.use_hair)
+ sync_curves(mesh, b_mesh, b_ob, motion);
+
/* free derived mesh */
b_data.meshes.remove(b_mesh);
}