diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml index 7347013..b7a0716 100644 --- a/.gitlab/ci/build.gitlab-ci.yml +++ b/.gitlab/ci/build.gitlab-ci.yml @@ -8,5 +8,8 @@ build: name: multi_user paths: - multi_user - + only: + refs: + - master + - develop diff --git a/multi_user/__init__.py b/multi_user/__init__.py index 70586ed..13e990a 100644 --- a/multi_user/__init__.py +++ b/multi_user/__init__.py @@ -45,7 +45,7 @@ from . import environment, utils # TODO: remove dependency as soon as replication will be installed as a module DEPENDENCIES = { - ("replication", '0.0.20'), + ("replication", '0.1.0'), ("deepdiff", '5.0.1'), } diff --git a/multi_user/operators.py b/multi_user/operators.py index 762d08b..256f8d1 100644 --- a/multi_user/operators.py +++ b/multi_user/operators.py @@ -35,7 +35,7 @@ from bpy.app.handlers import persistent from . import bl_types, delayable, environment, presence, ui, utils from replication.constants import (FETCHED, STATE_ACTIVE, STATE_INITIAL, - STATE_SYNCING) + STATE_SYNCING, RP_COMMON, UP) from replication.data import ReplicatedDataFactory from replication.exception import NonAuthorizedOperationError from replication.interface import Session @@ -623,7 +623,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 (go deeper ?) - if node.owner in [client.id, 'COMMON'] and node.state == UP: + if node.owner in [client.id, RP_COMMON] and node.state == UP: # Avoid slow geometry update if 'EDIT' in context.mode: break