refactor: cleanup

This commit is contained in:
Swann
2019-09-26 22:42:42 +02:00
parent c91ed17c23
commit e1657f1184
4 changed files with 15 additions and 21 deletions

View File

@ -21,12 +21,8 @@ def load_node(target_node_tree, source):
target_node.image = bpy.data.images[source['image']['name']] target_node.image = bpy.data.images[source['image']['name']]
for input in source["inputs"]: for input in source["inputs"]:
try:
if hasattr(target_node.inputs[input], "default_value"): if hasattr(target_node.inputs[input], "default_value"):
target_node.inputs[input].default_value = source["inputs"][input]["default_value"] target_node.inputs[input].default_value = source["inputs"][input]["default_value"]
except Exception as e:
print("loading error {}".format(e))
continue
def load_link(target_node_tree, source): def load_link(target_node_tree, source):

View File

@ -88,7 +88,6 @@ class Dumper:
def _dump_any(self, any, depth): def _dump_any(self, any, depth):
for filter_function, dump_function in self.type_subset: for filter_function, dump_function in self.type_subset:
if filter_function(any): if filter_function(any):
# print(any)
return dump_function[not (depth >= self.depth)](any, depth + 1) return dump_function[not (depth >= self.depth)](any, depth + 1)
def _build_inline_dump_functions(self): def _build_inline_dump_functions(self):

View File

@ -122,9 +122,13 @@ class SessionStartOperator(bpy.types.Operator):
"A session is already hosted on this address") "A session is already hosted on this address")
return {"CANCELLED"} return {"CANCELLED"}
if settings.init_scene and settings.is_admin: if settings.init_scene and self.host:
init_supported_datablocks(supported_bl_types) init_supported_datablocks(supported_bl_types)
for node in client.list():
client.commit(node)
# Init user settings
usr = presence.User( usr = presence.User(
username=settings.username, username=settings.username,
color=(settings.client_color.r, color=(settings.client_color.r,
@ -132,19 +136,14 @@ class SessionStartOperator(bpy.types.Operator):
settings.client_color.b, settings.client_color.b,
1), 1),
) )
settings.user_uuid = client.add(usr) settings.user_uuid = client.add(usr)
client.commit(settings.user_uuid)
delayables.append(delayable.ClientUpdate( delayables.append(delayable.ClientUpdate(
client_uuid=settings.user_uuid)) client_uuid=settings.user_uuid))
delayables.append(delayable.DynamicRightSelectTimer()) delayables.append(delayable.DynamicRightSelectTimer())
for node in client.list():
try:
client.commit(node)
except Exception as e:
print("error on first commit {}".format(e))
# Push all added values # Push all added values
client.push() client.push()