From c616054878e2c7095e29d2c3df38a68aed4f1e9f Mon Sep 17 00:00:00 2001 From: Swann Date: Mon, 7 Jun 2021 17:06:41 +0200 Subject: [PATCH] tour du python blender --- multi_user/libs/replication | 2 +- multi_user/operators.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/multi_user/libs/replication b/multi_user/libs/replication index ff43a86..d49651e 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit ff43a866bc591bb0c08458b86c303264fbfafb04 +Subproject commit d49651edb46d5b184af912f9949a5ec0ac6cf550 diff --git a/multi_user/operators.py b/multi_user/operators.py index 1c85a68..c4fba5f 100644 --- a/multi_user/operators.py +++ b/multi_user/operators.py @@ -850,7 +850,7 @@ def update_external_dependencies(): nodes_ids = [n.uuid for n in session.repository.graph.values() if n.data['type_id'] in ['WindowsPath', 'PosixPath']] for node_id in nodes_ids: node = session.repository.graph.get(node_id) - if node and node.owner in [session.id, RP_COMMON]: + if node and node.owner in [session.repository.username, RP_COMMON]: porcelain.commit(session.repository, node_id) porcelain.push(session.repository,'origin', node_id) @@ -928,7 +928,7 @@ def depsgraph_evaluation(scene): # - if its ours or ( under common and diff), launch the # update process # - if its to someone else, ignore the update - if node and (node.owner == session.id or check_common): + if node and (node.owner == session.repository.username or check_common): if node.state == UP: try: porcelain.commit(session.repository, node.uuid)