diff --git a/bl_types/bl_material.py b/bl_types/bl_material.py index 8d6bf32..2717089 100644 --- a/bl_types/bl_material.py +++ b/bl_types/bl_material.py @@ -21,12 +21,8 @@ def load_node(target_node_tree, source): target_node.image = bpy.data.images[source['image']['name']] for input in source["inputs"]: - try: - if hasattr(target_node.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 + if hasattr(target_node.inputs[input], "default_value"): + target_node.inputs[input].default_value = source["inputs"][input]["default_value"] def load_link(target_node_tree, source): diff --git a/libs/dump_anything.py b/libs/dump_anything.py index 2ea18b3..b8f052d 100644 --- a/libs/dump_anything.py +++ b/libs/dump_anything.py @@ -88,7 +88,6 @@ class Dumper: def _dump_any(self, any, depth): for filter_function, dump_function in self.type_subset: if filter_function(any): - # print(any) return dump_function[not (depth >= self.depth)](any, depth + 1) def _build_inline_dump_functions(self): diff --git a/libs/replication b/libs/replication index 57c5256..5c7123f 160000 --- a/libs/replication +++ b/libs/replication @@ -1 +1 @@ -Subproject commit 57c5256a4d93243a18ce1f574e8deed07c1a0b99 +Subproject commit 5c7123f50c36749ed0d42c21f9074c6faa66a4d2 diff --git a/operators.py b/operators.py index 62ed611..75c2a99 100644 --- a/operators.py +++ b/operators.py @@ -112,7 +112,7 @@ class SessionStartOperator(bpy.types.Operator): address=settings.ip, port=settings.port ) - + time.sleep(0.5) if client.state == 0: @@ -122,9 +122,13 @@ class SessionStartOperator(bpy.types.Operator): "A session is already hosted on this address") return {"CANCELLED"} - if settings.init_scene and settings.is_admin: + if settings.init_scene and self.host: init_supported_datablocks(supported_bl_types) + for node in client.list(): + client.commit(node) + + # Init user settings usr = presence.User( username=settings.username, color=(settings.client_color.r, @@ -132,18 +136,13 @@ class SessionStartOperator(bpy.types.Operator): settings.client_color.b, 1), ) - settings.user_uuid = client.add(usr) + client.commit(settings.user_uuid) + delayables.append(delayable.ClientUpdate( client_uuid=settings.user_uuid)) - + 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 client.push() @@ -155,7 +154,7 @@ class SessionStartOperator(bpy.types.Operator): # Register blender main thread tools for d in delayables: d.register() - + self.report( {'INFO'}, "connexion on tcp://{}:{}".format(settings.ip, settings.port)) @@ -321,8 +320,8 @@ def redresh_handler(dummy): if client: user = client.get(uuid=bpy.context.window_manager.session.user_uuid) - - if hasattr(user,"pointer"): + + if hasattr(user, "pointer"): user.pointer.is_dirty = True