[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50307] trunk/blender/intern/cycles/ blender/blender_sync.cpp: Fix #32463, Cycles crashing.

[Lukas Toenne]

Revision: 50307
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50307
Author:   lukastoenne
Date:     2012-09-01 11:30:22 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_sync.cpp

Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp        2012-09-01 
11:30:19 UTC (rev 50306)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp        2012-09-01 
11:30:22 UTC (rev 50307)
@@ -97,7 +97,7 @@
                                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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs