Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove unused STRICT right strategy

Browse Source
This commit is contained in:
Swann
2020-06-16 18:04:27 +02:00
parent 88e69711ba
commit bcdefca32c
5 changed files with 47 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
multi_user/delayable.py
View File

@ -115,17 +115,12 @@ class DynamicRightSelectTimer(Timer):
if self._user is None: if self._user is None:
self._user = session.online_users.get(settings.username) self._user = session.online_users.get(settings.username)
if self._right_strategy is None:
self._right_strategy = session.config[
'right_strategy']
if self._user: if self._user:
current_selection = utils.get_selected_objects( current_selection = utils.get_selected_objects(
bpy.context.scene, bpy.context.scene,
bpy.data.window_managers['WinMan'].windows[0].view_layer bpy.data.window_managers['WinMan'].windows[0].view_layer
) )
if current_selection != self._last_selection: if current_selection != self._last_selection:
if self._right_strategy == RP_COMMON:
obj_common = [ obj_common = [
o for o in self._last_selection if o not in current_selection] o for o in self._last_selection if o not in current_selection]
obj_ours = [ obj_ours = [

2
multi_user/libs/replication

Submodule multi_user/libs/replication updated: 4d7b8d96a8...6ed4e63b3d

3
multi_user/operators.py
View File

@ -112,8 +112,7 @@ class SessionStartOperator(bpy.types.Operator):
client = Session( client = Session(
factory=bpy_factory, factory=bpy_factory,
python_path=bpy.app.binary_path_python, python_path=bpy.app.binary_path_python)
default_strategy=settings.right_strategy)
# Host a session # Host a session
if self.host: if self.host:

8
multi_user/preferences.py
View File

@ -97,13 +97,6 @@ class SessionPrefs(bpy.types.AddonPreferences):
name="start_empty", name="start_empty",
default=False default=False
) )
right_strategy: bpy.props.EnumProperty(
name='right_strategy',
description='right strategy',
items={
('STRICT', 'strict', 'strict right repartition'),
('COMMON', 'common', 'relaxed right repartition')},
default='COMMON')
cache_directory: bpy.props.StringProperty( cache_directory: bpy.props.StringProperty(
name="cache directory", name="cache directory",
subtype="DIR_PATH", subtype="DIR_PATH",
@ -264,7 +257,6 @@ class SessionPrefs(bpy.types.AddonPreferences):
icon='DISCLOSURE_TRI_DOWN' if self.conf_session_hosting_expanded icon='DISCLOSURE_TRI_DOWN' if self.conf_session_hosting_expanded
else 'DISCLOSURE_TRI_RIGHT', emboss=False) else 'DISCLOSURE_TRI_RIGHT', emboss=False)
if self.conf_session_hosting_expanded: if self.conf_session_hosting_expanded:
box.row().prop(self, "right_strategy", text="Right model")
row = box.row() row = box.row()
row.label(text="Start with an empty scene:") row.label(text="Start with an empty scene:")
row.prop(self, "start_empty", text="") row.prop(self, "start_empty", text="")

4
multi_user/ui.py
View File

@ -262,10 +262,6 @@ class SESSION_PT_settings_replication(bpy.types.Panel):
row = layout.row() row = layout.row()
row.prop(settings.sync_flags, "sync_render_settings") row.prop(settings.sync_flags, "sync_render_settings")
row = layout.row(align=True)
row.label(text="Right strategy:")
row.prop(settings, "right_strategy", text="")
row = layout.row() row = layout.row()
row = layout.row() row = layout.row()