Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / blender / blender_sync.h
index d690adb56623a503da04ad0d8bc77d0a2e531ff7..e736158943648c8eb3bdd69165a5d11b5c4308bb 100644 (file)
@@ -137,11 +137,6 @@ private:
                                int width, int height,
                                float motion_time);
 
-       /* particles */
-       bool sync_dupli_particle(BL::Object& b_ob,
-                                BL::DupliObject& b_dup,
-                                Object *object);
-
        /* Images. */
        void sync_images();
 
@@ -160,7 +155,6 @@ private:
        id_map<ObjectKey, Object> object_map;
        id_map<void*, Mesh> mesh_map;
        id_map<ObjectKey, Light> light_map;
-       id_map<ParticleSystemKey, ParticleSystem> particle_system_map;
        set<Mesh*> mesh_synced;
        set<Mesh*> mesh_motion_synced;
        std::set<float> motion_times;