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 8caa807093915b40c324bf6f0d897dc22ada0cf8..2fad7d5fe717840b31d67f008c04635da153a944 100644 (file)
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -159,7 +159,7 @@ private:
        id_map<ObjectKey, Light> light_map;
        set<Mesh*> mesh_synced;
        set<Mesh*> mesh_motion_synced;
-       std::set<float> motion_times;
+       set<float> motion_times;
        void *world_map;
        bool world_recalc;