From 6d9c9c4532acaad00daeb4639564aef9e7255e6b Mon Sep 17 00:00:00 2001 From: Swann Date: Thu, 24 Jun 2021 17:45:34 +0200 Subject: [PATCH] fix: timeline marker selection feat: basic test --- multi_user/bl_types/bl_scene.py | 2 +- multi_user/libs/replication | 2 +- tests/test_bl_types/test_scene.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/multi_user/bl_types/bl_scene.py b/multi_user/bl_types/bl_scene.py index ebb3282..cc02235 100644 --- a/multi_user/bl_types/bl_scene.py +++ b/multi_user/bl_types/bl_scene.py @@ -453,7 +453,7 @@ class BlScene(ReplicatedDatablock): 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() diff --git a/multi_user/libs/replication b/multi_user/libs/replication index ce3a7b4..ff88725 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit ce3a7b4363ec9fa879925d57c8555decbc92158a +Subproject commit ff8872599187b5b65dc679aed3ab6441fc717c40 diff --git a/tests/test_bl_types/test_scene.py b/tests/test_bl_types/test_scene.py index ab003e7..1fd8949 100644 --- a/tests/test_bl_types/test_scene.py +++ b/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()