diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-01 15:30:22 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-01 15:30:22 +0400 |
| commit | ff9b071fbde85af66182236eea1dfa0b4c1e173b (patch) | |
| tree | 09bbb1c031fb386ec11c4ce5c7320cd8cf4eb4ff /intern/cycles/blender/blender_sync.cpp | |
| parent | cc835e47b0605d51f5cc2793fdcb144dfb5ba3ab (diff) | |
Fix #32463, Cycles crashing. The particle system sync_recalc part was checking object data, which can be NULL and doesn't actually say anything about particles, removed.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index e8bd2d59115..6d014a91a9c 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -97,7 +97,7 @@ bool BlenderSync::sync_recalc() light_map.set_recalc(*b_ob); } - if(b_ob->is_updated_data() || b_ob->data().is_updated()) { + if(b_ob->is_updated_data()) { BL::Object::particle_systems_iterator b_psys; for (b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys) particle_system_map.set_recalc(*b_ob); |