diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-18 19:03:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-18 19:03:18 +0400 |
| commit | 5a355c2b01a7b9688adcdd92637c9c06c2671b91 (patch) | |
| tree | 8d4ebb1fbea3b8d9a0098a7dea894583ebe5c4bf /intern/cycles/render/object.cpp | |
| parent | a15818f1f7d3089d85d72a4196d0240d9f2f81d9 (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/render/object.cpp')
| -rw-r--r-- | intern/cycles/render/object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 0479dd9af74..6fb96a3290c 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -253,9 +253,9 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene Transform mtfm_pre = ob->motion.pre; Transform mtfm_post = ob->motion.post; - if(!mesh->attributes.find(ATTR_STD_MOTION_PRE)) + if(!(mesh->attributes.find(ATTR_STD_MOTION_PRE) || mesh->curve_attributes.find(ATTR_STD_MOTION_PRE))) mtfm_pre = mtfm_pre * itfm; - if(!mesh->attributes.find(ATTR_STD_MOTION_POST)) + if(!(mesh->attributes.find(ATTR_STD_MOTION_POST) || mesh->curve_attributes.find(ATTR_STD_MOTION_POST))) mtfm_post = mtfm_post * itfm; memcpy(&objects_vector[i*OBJECT_VECTOR_SIZE+0], &mtfm_pre, sizeof(float4)*3); |