From c74d12c843b832a58d25f5d92c9d478f86ca96e5 Mon Sep 17 00:00:00 2001
From: Swann <swann.martinez@protonmail.com>
Date: Tue, 13 Oct 2020 17:10:25 +0200
Subject: [PATCH] fix: handle world empty dependencies

---
 multi_user/bl_types/bl_material.py | 25 +++++++++++++++++--------
 multi_user/bl_types/bl_world.py    | 14 +++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/multi_user/bl_types/bl_material.py b/multi_user/bl_types/bl_material.py
index ef1cba0..4ba232a 100644
--- a/multi_user/bl_types/bl_material.py
+++ b/multi_user/bl_types/bl_material.py
@@ -26,6 +26,7 @@ from .bl_datablock import BlDatablock, get_datablock_from_uuid
 
 NODE_SOCKET_INDEX = re.compile('\[(\d*)\]')
 
+
 def load_node(node_data, node_tree):
     """ Load a node into a node_tree from a dict
 
@@ -41,7 +42,7 @@ def load_node(node_data, node_tree):
     image_uuid = node_data.get('image_uuid', None)
 
     if image_uuid and not target_node.image:
-        target_node.image = get_datablock_from_uuid(image_uuid,None)
+        target_node.image = get_datablock_from_uuid(image_uuid, None)
 
     for input in node_data["inputs"]:
         if hasattr(target_node.inputs[input], "default_value"):
@@ -70,8 +71,10 @@ def load_links(links_data, node_tree):
     """
 
     for link in links_data:
-        input_socket = node_tree.nodes[link['to_node']].inputs[int(link['to_socket'])]
-        output_socket = node_tree.nodes[link['from_node']].outputs[int(link['from_socket'])]
+        input_socket = node_tree.nodes[link['to_node']
+                                       ].inputs[int(link['to_socket'])]
+        output_socket = node_tree.nodes[link['from_node']].outputs[int(
+            link['from_socket'])]
         node_tree.links.new(input_socket, output_socket)
 
 
@@ -86,8 +89,10 @@ def dump_links(links):
     links_data = []
 
     for link in links:
-        to_socket = NODE_SOCKET_INDEX.search(link.to_socket.path_from_id()).group(1)
-        from_socket = NODE_SOCKET_INDEX.search(link.from_socket.path_from_id()).group(1)
+        to_socket = NODE_SOCKET_INDEX.search(
+            link.to_socket.path_from_id()).group(1)
+        from_socket = NODE_SOCKET_INDEX.search(
+            link.from_socket.path_from_id()).group(1)
         links_data.append({
             'to_node': link.to_node.name,
             'to_socket': to_socket,
@@ -180,6 +185,12 @@ def dump_node(node):
     return dumped_node
 
 
+def get_node_tree_dependencies(node_tree: bpy.types.NodeTree) -> list:
+    has_image = lambda node : (node.type in ['TEX_IMAGE', 'TEX_ENVIRONMENT'] and node.image)
+
+    return [node.image for node in node_tree.nodes if has_image(node)]
+
+
 class BlMaterial(BlDatablock):
     bl_id = "materials"
     bl_class = bpy.types.Material
@@ -283,9 +294,7 @@ class BlMaterial(BlDatablock):
         deps = []
 
         if self.instance.use_nodes:
-            for node in self.instance.node_tree.nodes:
-                if node.type in ['TEX_IMAGE','TEX_ENVIRONMENT'] and node.image:
-                    deps.append(node.image)
+            deps.extend(get_node_tree_dependencies(self.instance.node_tree))
         if self.is_library:
             deps.append(self.instance.library)
 
diff --git a/multi_user/bl_types/bl_world.py b/multi_user/bl_types/bl_world.py
index 9f2fe2e..f641c9f 100644
--- a/multi_user/bl_types/bl_world.py
+++ b/multi_user/bl_types/bl_world.py
@@ -21,7 +21,11 @@ import mathutils
 
 from .dump_anything import Loader, Dumper
 from .bl_datablock import BlDatablock
-from .bl_material import load_links, load_node, dump_node, dump_links
+from .bl_material import (load_links,
+                          load_node,
+                          dump_node,
+                          dump_links,
+                          get_node_tree_dependencies)
 
 
 class BlWorld(BlDatablock):
@@ -39,7 +43,7 @@ class BlWorld(BlDatablock):
     def _load_implementation(self, data, target):
         loader = Loader()
         loader.load(target, data)
-        
+
         if data["use_nodes"]:
             if target.node_tree is None:
                 target.use_nodes = True
@@ -52,7 +56,6 @@ class BlWorld(BlDatablock):
             # Load nodes links
             target.node_tree.links.clear()
 
-            
             load_links(data["node_tree"]["links"], target.node_tree)
 
     def _dump_implementation(self, data, instance=None):
@@ -83,10 +86,7 @@ class BlWorld(BlDatablock):
         deps = []
 
         if self.instance.use_nodes:
-            for node in self.instance.node_tree.nodes:
-                if node.type in ['TEX_IMAGE','TEX_ENVIRONMENT']:
-                    deps.append(node.image)
+            deps.extend(get_node_tree_dependencies(self.instance.node_tree))
         if self.is_library:
             deps.append(self.instance.library)
         return deps
-