revert updated blender addon support for now

GimelStudio · Mar 4, 2021 · 61bf26c · 61bf26c
1 parent f454805
commit 61bf26c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/src/GimelStudio/application.py b/src/GimelStudio/application.py
@@ -498,21 +498,28 @@ def _SetupDefaultNodes(self):
 
         # If a path is passed into the "--blender" arg
         # set the Image node file path to that path.
-        if self._arguments.blender == "default":
-            node = self._nodeGraph.AddNode('corenode_imagefromblender',
-                                                pos=wx.Point(x - 340, y))
-            node.NodeEditProp(idname="Layer", value="Layer 0", render=True)
-
-            try:
-                nodes = self._nodeGraph.GetNodesByTypeId("corenode_imagefromblender")
-                for node in nodes:
-                    node.RefreshLayers()
-            except:
-                pass
+        # if self._arguments.blender == "default":
+        #     node = self._nodeGraph.AddNode('corenode_imagefromblender',
+        #                                         pos=wx.Point(x - 340, y))
+        #     node.NodeEditProp(idname="Layer", value="Layer 0", render=True)
+
+        #     try:
+        #         nodes = self._nodeGraph.GetNodesByTypeId("corenode_imagefromblender")
+        #         for node in nodes:
+        #             node.RefreshLayers()
+        #     except:
+        #         pass
 
-        else:
-            img_node = self._nodeGraph.AddNode('corenode_image',
-                                                pos=wx.Point(x - 340, y))
+        # else:
+        #     img_node = self._nodeGraph.AddNode('corenode_image',
+        #                                         pos=wx.Point(x - 340, y))
+
+        if self._arguments.blender != "":
+            img_node.NodeEditProp(
+                idname="File Path",
+                value=self._arguments.blender,
+                render=False
+            )
 
         # This node is here just for
         # testing during development.
@@ -524,7 +531,7 @@ def _SetupDefaultNodes(self):
     def OnWindowActivate(self, event):
         # Window is being focused
         if event.GetActive() is True:
-            print("focus")
+            #print("focus")
 
             nodes = self._nodeGraph.GetNodesByTypeId("corenode_imagefromblender")
             for node in nodes:

diff --git a/src/GimelStudio/node_importer.py b/src/GimelStudio/node_importer.py
@@ -27,8 +27,8 @@
 from GimelStudio.corenodes.input import (image_node,
                                          color_image_node,
                                          noise_image_node,
-                                         gradient_image_node,
-                                         from_blender_node)
+                                         gradient_image_node)
+                                         #from_blender_node
 from GimelStudio.corenodes.mask import edge_detect_node
 # from GimelStudio.corenodes.draw import text_node
 from GimelStudio.corenodes.color import (color_balance_node,