Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / intern / cycles / blender / blender_sync.cpp
index 8ec9ecfd8613bb175918bb91d8099a09d1617969..62b9fa3c92b852c8fc947f6116387e767874755a 100644 (file)
@@ -56,7 +56,6 @@ BlenderSync::BlenderSync(BL::RenderEngine& b_engine,
   object_map(&scene->objects),
   mesh_map(&scene->meshes),
   light_map(&scene->lights),
-  particle_system_map(&scene->particle_systems),
   world_map(NULL),
   world_recalc(false),
   scene(scene),
@@ -144,12 +143,6 @@ bool BlenderSync::sync_recalc()
                        if(b_ob->is_updated_data() || b_ob->data().is_updated())
                                light_map.set_recalc(*b_ob);
                }
-               
-               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);
-               }
        }
 
        BL::BlendData::meshes_iterator b_mesh;
@@ -183,7 +176,6 @@ bool BlenderSync::sync_recalc()
                object_map.has_recalc() ||
                light_map.has_recalc() ||
                mesh_map.has_recalc() ||
-               particle_system_map.has_recalc() ||
                BlendDataObjects_is_updated_get(&b_data.ptr) ||
                world_recalc;