kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for Cycles particle motion blur hiding fix.

Browse Source 
My mistake in modifying the patch.
This commit is contained in:
Brecht Van Lommel 2016-08-06 00:38:23 +02:00
parent df7be61438
commit 734e0aca38
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
intern/cycles/render/object.cpp
View File

@ -55,9 +55,9 @@ Object::Object()
particle_system = NULL; particle_system = NULL;
particle_index = 0; particle_index = 0;
bounds = BoundBox::empty; bounds = BoundBox::empty;
motion.pre = transform_identity(); motion.pre = transform_empty();
motion.mid = transform_identity(); motion.mid = transform_empty();
motion.post = transform_identity(); motion.post = transform_empty();
use_motion = false; use_motion = false;
} }
@ -346,6 +346,15 @@ void ObjectManager::device_update_object_transform(UpdateObejctTransformState *s
Transform mtfm_pre = ob->motion.pre; Transform mtfm_pre = ob->motion.pre;
Transform mtfm_post = ob->motion.post; Transform mtfm_post = ob->motion.post;
/* In case of missing motion information for previous/next frame,
* assume there is no motion. */
if(!ob->use_motion || mtfm_pre == transform_empty()) {
mtfm_pre = ob->tfm;
}
if(!ob->use_motion || mtfm_post == transform_empty()) {
mtfm_post = ob->tfm;
}
if(!mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION)) { if(!mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION)) {
mtfm_pre = mtfm_pre * itfm; mtfm_pre = mtfm_pre * itfm;
mtfm_post = mtfm_post * itfm; mtfm_post = mtfm_post * itfm;