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

feat: node sanitize on collection and scene update

Browse Source
This commit is contained in:
Swann 2021-05-17 17:35:34 +02:00
parent 689c2473d6
commit fb1c985f31
No known key found for this signature in database
GPG Key ID: E1D3641A7C43AACB
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
multi_user/bl_types/bl_datablock.py
View File

@ -133,21 +133,17 @@ class BlDatablock(ReplicatedDatablock):
if not datablock_ref:
try:
datablock_ref = datablock_root[self.data['name']]
except Exception:
pass
except KeyError as e:
if construct:
name = self.data.get('name')
logging.debug(f"Constructing {name}")
datablock_ref = self._construct(data=self.data)
setattr(datablock_ref, 'uuid', self.uuid)
else:
return False
self.instance = datablock_ref
return True
if construct and not datablock_ref:
name = self.data.get('name')
logging.debug(f"Constructing {name}")
datablock_ref = self._construct(data=self.data)
if datablock_ref is not None:
setattr(datablock_ref, 'uuid', self.uuid)
self.instance = datablock_ref
return True
else:
return False
def remove_instance(self):
"""

12
multi_user/operators.py
View File

@ -946,7 +946,8 @@ def sanitize_deps_graph(remove_nodes: bool = False):
rm_cpt += 1
except NonAuthorizedOperationError:
continue
logging.info(f"Sanitize took { utils.current_milli_time()-start} ms, removed {rm_cpt} nodes")
if rm_cpt:
logging.info(f"Sanitize took { utils.current_milli_time()-start} ms, removed {rm_cpt} nodes")
@persistent
@ -1013,14 +1014,15 @@ def depsgraph_evaluation(scene):
# A new scene is created
elif isinstance(update.id, bpy.types.Scene):
ref = session.repository.get_node_by_datablock(update.id)
if ref:
ref.resolve()
if ref and ref.resolve(construct=False):
sanitize_deps_graph(remove_nodes=True)
else:
scn_uuid = porcelain.add(session.repository, update.id)
porcelain.commit(session.node_id, scn_uuid)
session.push(scn_uuid, check_data=False)
elif isinstance(update.id, bpy.types.Collection):
sanitize_deps_graph()
if isinstance(update.id, bpy.types.Collection):
sanitize_deps_graph(remove_nodes=True)
def register():
from bpy.utils import register_class

2
multi_user/timers.py
View File

@ -248,7 +248,7 @@ class DynamicRightSelectTimer(Timer):
key,
RP_COMMON,
ignore_warnings=True,
affect_dependencies=recursive)
affect_dependencies=True)
except NonAuthorizedOperationError:
logging.warning(
f"Not authorized to change {key} owner")