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

feat(rcf): work on updates

Browse Source
This commit is contained in:
Swann Martinez
2019-04-03 17:52:45 +02:00
parent dc7e19c74a
commit 4123ffbb38
2 changed files with 62 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net_components.py
View File

@ -260,6 +260,7 @@ class RCFClient():
if self.pull_sock in socks: if self.pull_sock in socks:
rcfmsg = RCFMessage.recv(self.pull_sock) rcfmsg = RCFMessage.recv(self.pull_sock)
if rcfmsg.id != self.id:
rcfmsg.store(self.property_map) rcfmsg.store(self.property_map)
for f in self.on_recv: for f in self.on_recv:

16
net_operators.py
View File

@ -437,7 +437,7 @@ def load_default(target=None, data=None, create=False, type=None):
def update_scene(msg): def update_scene(msg):
global client global client
if msg.id != client.id:
net_vars = bpy.context.scene.session_settings net_vars = bpy.context.scene.session_settings
# if net_vars.active_object: # if net_vars.active_object:
@ -520,7 +520,7 @@ post_init_callbacks = [refresh_window]
def default_tick(): def default_tick():
if not update_tasks.empty(): if not update_tasks.empty():
update = update_tasks.get() update = update_tasks.get()
print(update)
try: try:
push(update[0],update[1]) push(update[0],update[1])
except: except:
@ -834,12 +834,12 @@ def depsgraph_update(scene):
break break
if push: if push:
if len(updates) is 1: # if len(updates) is 1:
updated_data = updates[0] # updated_data = updates[0]
if scene.session_settings.active_object and updated_data.id.name == scene.session_settings.active_object.name: # if scene.session_settings.active_object and updated_data.id.name == scene.session_settings.active_object.name:
if updated_data.is_updated_transform: # if updated_data.is_updated_transform:
add_update(updated_data.id.bl_rna.name, updated_data.id.name) # add_update(updated_data.id.bl_rna.name, updated_data.id.name)
else: # else:
for update in ordered(updates): for update in ordered(updates):
if update[2] == "Master Collection": if update[2] == "Master Collection":
pass pass