Merge branch '64-user-selection-incositent-with-active-view_layer' into 'develop'

Resolve "User selection incositent with active view_layer"

See merge request slumber/multi-user!17
This commit is contained in:
Swann Martinez
2020-02-25 15:51:42 +00:00
2 changed files with 5 additions and 3 deletions
+3 -1
View File
@@ -101,7 +101,9 @@ class DynamicRightSelectTimer(Timer):
if self._user:
current_selection = utils.get_selected_objects(
bpy.context.scene)
bpy.context.scene,
bpy.data.window_managers['WinMan'].windows[0].view_layer
)
if current_selection != self._last_selection:
if self._right_strategy == RP_COMMON:
obj_common = [
+2 -2
View File
@@ -104,8 +104,8 @@ def get_armature_edition_context(armature):
return override
def get_selected_objects(scene):
return [obj.uuid for obj in scene.objects if obj.select_get()]
def get_selected_objects(scene, active_view_layer):
return [obj.uuid for obj in scene.objects if obj.select_get(view_layer=active_view_layer)]
def load_dict(src_dict, target):