Merge branch '175-new-object-generated-during-separate-object-operator-doesn-t-sync' into 'develop'
Resolve "New object generated during separate object operator doesn't sync" See merge request slumber/multi-user!108
This commit is contained in:
commit
209062af4f
@ -239,3 +239,10 @@ class BlCurve(BlDatablock):
|
|||||||
deps.append(material)
|
deps.append(material)
|
||||||
|
|
||||||
return deps
|
return deps
|
||||||
|
|
||||||
|
def diff(self):
|
||||||
|
if 'EDIT' in bpy.context.mode \
|
||||||
|
and not self.preferences.sync_flags.sync_during_editmode:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return super().diff()
|
@ -174,3 +174,10 @@ class BlMesh(BlDatablock):
|
|||||||
deps.append(material)
|
deps.append(material)
|
||||||
|
|
||||||
return deps
|
return deps
|
||||||
|
|
||||||
|
def diff(self):
|
||||||
|
if 'EDIT' in bpy.context.mode \
|
||||||
|
and not self.preferences.sync_flags.sync_during_editmode:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return super().diff()
|
||||||
|
@ -997,11 +997,6 @@ def depsgraph_evaluation(scene):
|
|||||||
# - if its to someone else, ignore the update
|
# - if its to someone else, ignore the update
|
||||||
if node and node.owner in [session.id, RP_COMMON]:
|
if node and node.owner in [session.id, RP_COMMON]:
|
||||||
if node.state == UP:
|
if node.state == UP:
|
||||||
# Avoid slow geometry update
|
|
||||||
if 'EDIT' in context.mode and \
|
|
||||||
not settings.sync_flags.sync_during_editmode:
|
|
||||||
break
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if node.has_changed():
|
if node.has_changed():
|
||||||
session.commit(node.uuid)
|
session.commit(node.uuid)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user