Merge branch '119-add-timeline-marker-sync' into 'develop'

Resolve "Add timeline marker sync"

See merge request slumber/multi-user!133

multi_user/bl_types/bl_scene.py

@@ -445,6 +445,15 @@ class BlScene(ReplicatedDatablock):
         elif datablock.sequence_editor and not sequences:
             datablock.sequence_editor_clear()
 
+        # Timeline markers
+        markers = data.get('timeline_markers')
+        if markers:
+            datablock.timeline_markers.clear()
+            for name, frame, camera in markers:
+                marker = datablock.timeline_markers.new(name, frame=frame)
+                if camera:
+                    marker.camera = resolve_datablock_from_uuid(camera, bpy.data.objects)
+                marker.select = False
         # FIXME: Find a better way after the replication big refacotoring
         # Keep other user from deleting collection object by flushing their history
         flush_history()
@@ -517,6 +526,10 @@ class BlScene(ReplicatedDatablock):
                 dumped_sequences[seq.name] = dump_sequence(seq)
             data['sequences'] = dumped_sequences
 
+        # Timeline markers
+        if datablock.timeline_markers:
+            data['timeline_markers'] = [(m.name, m.frame, getattr(m.camera, 'uuid', None)) for m in datablock.timeline_markers]
+
         return data
 
     @staticmethod

tests/test_bl_types/test_scene.py

@@ -12,6 +12,8 @@ def test_scene(clear_blend):
     get_preferences().sync_flags.sync_render_settings = True
 
     datablock = bpy.data.scenes.new("toto")
+    datablock.timeline_markers.new('toto', frame=10)
+    datablock.timeline_markers.new('tata', frame=1)
     datablock.view_settings.use_curve_mapping = True
     # Test
     implementation = BlScene()