Merge remote-tracking branch 'origin/master' into blender2.8

[blender.git] / intern / cycles / blender / blender_sync.h

diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index 9a01b4f2b6eea9c7c724b2fcb41c9de9ad22da30..2fad7d5fe717840b31d67f008c04635da153a944 100644 (file)
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -139,11 +139,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();
 
@@ -162,7 +157,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;
        set<float> motion_times;