archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for particle object rendering in Cycles. On object sync the object first has to determine if a particle update is needed (which depends on dupli objects and their meshes), before deciding to skip the actual syncing.

Browse Source
This commit is contained in:
Lukas Toenne
2012-08-10 10:15:45 +00:00
parent a1dd6ea836
commit d33a0effba
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/blender/blender_object.cpp
View File

@@ -247,8 +247,11 @@ void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::Object b_ob,
scene->object_manager->tag_update(scene);
}
/* updated dupli objects require particle sync */
bool need_particle_update = object_need_particle_update(b_ob);
/* object sync */
if(object_updated || (object->mesh && object->mesh->need_update)) {
if(object_updated || (object->mesh && object->mesh->need_update) || need_particle_update) {
object->name = b_ob.name().c_str();
object->pass_id = b_ob.pass_index();
object->tfm = tfm;
@@ -275,7 +278,7 @@ void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::Object b_ob,
object->particle_id = particle_id;
/* particle sync */
if (object_use_particles(b_ob))
if (need_particle_update)
sync_particles(object, b_ob);
object->tag_update(scene);