Hide NodeResizeImage and NodeImageFile if not v3.5

These nodes were not registered, but they were still present in the node categories. This commit follows the same hiding logic as in (un)registration.
carson-katri · Apr 25, 2023 · 4b5fceb · 4b5fceb
1 parent 8bf0954
commit 4b5fceb
Showing 1 changed file with 55 additions and 38 deletions.
diff --git a/engine/__init__.py b/engine/__init__.py
@@ -17,45 +17,60 @@ class DreamTexturesNodeCategory(nodeitems_utils.NodeCategory):
     def poll(cls, context):
         return context.space_data.tree_type == DreamTexturesNodeTree.__name__
 
+pipeline_items = [
+    nodeitems_utils.NodeItem(NodeStableDiffusion.bl_idname),
+    nodeitems_utils.NodeItem(NodeControlNet.bl_idname),
+]
+
+input_items = [
+    nodeitems_utils.NodeItem(NodeInteger.bl_idname),
+    nodeitems_utils.NodeItem(NodeString.bl_idname),
+    nodeitems_utils.NodeItem(NodeImage.bl_idname),
+    nodeitems_utils.NodeItem(NodeImageFile.bl_idname),
+    nodeitems_utils.NodeItem(NodeCollection.bl_idname),
+    nodeitems_utils.NodeItem(NodeRenderProperties.bl_idname),
+]
+if bpy.app.version >= (3, 5, 0):
+    input_items.append(nodeitems_utils.NodeItem(NodeImageFile.bl_idname))
+
+utility_items =[
+    nodeitems_utils.NodeItem(NodeMath.bl_idname),
+    nodeitems_utils.NodeItem(NodeRandomValue.bl_idname),
+    nodeitems_utils.NodeItem(NodeRandomSeed.bl_idname),
+    nodeitems_utils.NodeItem(NodeSeed.bl_idname),
+    nodeitems_utils.NodeItem(NodeClamp.bl_idname),
+    nodeitems_utils.NodeItem(NodeFramePath.bl_idname),
+    nodeitems_utils.NodeItem(NodeCropImage.bl_idname),
+    nodeitems_utils.NodeItem(NodeResizeImage.bl_idname),
+    nodeitems_utils.NodeItem(NodeJoinImages.bl_idname),
+    nodeitems_utils.NodeItem(NodeColorCorrect.bl_idname),
+    nodeitems_utils.NodeItem(NodeSeparateColor.bl_idname),
+    nodeitems_utils.NodeItem(NodeCombineColor.bl_idname),
+    nodeitems_utils.NodeItem(NodeSwitch.bl_idname),
+    nodeitems_utils.NodeItem(NodeCompare.bl_idname),
+    nodeitems_utils.NodeItem(NodeReplaceString.bl_idname),
+]
+if bpy.app.version >= (3, 5, 0):
+    utility_items.append(nodeitems_utils.NodeItem(NodeResizeImage.bl_idname))
+
+annotations_items = [
+    nodeitems_utils.NodeItem(NodeAnnotationDepth.bl_idname),
+    nodeitems_utils.NodeItem(NodeAnnotationNormal.bl_idname),
+    nodeitems_utils.NodeItem(NodeAnnotationOpenPose.bl_idname),
+    nodeitems_utils.NodeItem(NodeAnnotationADE20K.bl_idname),
+    nodeitems_utils.NodeItem(NodeAnnotationViewport.bl_idname),
+]
+
+group_items = [
+    nodeitems_utils.NodeItem(bpy.types.NodeGroupOutput.__name__),
+]
+
 categories = [
-    DreamTexturesNodeCategory("DREAM_TEXTURES_PIPELINE", "Pipeline", items = [
-        nodeitems_utils.NodeItem(NodeStableDiffusion.bl_idname),
-        nodeitems_utils.NodeItem(NodeControlNet.bl_idname),
-    ]),
-    DreamTexturesNodeCategory("DREAM_TEXTURES_INPUT", "Input", items = [
-        nodeitems_utils.NodeItem(NodeInteger.bl_idname),
-        nodeitems_utils.NodeItem(NodeString.bl_idname),
-        nodeitems_utils.NodeItem(NodeImage.bl_idname),
-        nodeitems_utils.NodeItem(NodeImageFile.bl_idname),
-        nodeitems_utils.NodeItem(NodeCollection.bl_idname),
-        nodeitems_utils.NodeItem(NodeRenderProperties.bl_idname),
-    ]),
-    DreamTexturesNodeCategory("DREAM_TEXTURES_UTILITY", "Utilities", items = [
-        nodeitems_utils.NodeItem(NodeMath.bl_idname),
-        nodeitems_utils.NodeItem(NodeRandomValue.bl_idname),
-        nodeitems_utils.NodeItem(NodeRandomSeed.bl_idname),
-        nodeitems_utils.NodeItem(NodeSeed.bl_idname),
-        nodeitems_utils.NodeItem(NodeClamp.bl_idname),
-        nodeitems_utils.NodeItem(NodeFramePath.bl_idname),
-        nodeitems_utils.NodeItem(NodeCropImage.bl_idname),
-        nodeitems_utils.NodeItem(NodeResizeImage.bl_idname),
-        nodeitems_utils.NodeItem(NodeJoinImages.bl_idname),
-        nodeitems_utils.NodeItem(NodeColorCorrect.bl_idname),
-        nodeitems_utils.NodeItem(NodeSeparateColor.bl_idname),
-        nodeitems_utils.NodeItem(NodeCombineColor.bl_idname),
-        nodeitems_utils.NodeItem(NodeSwitch.bl_idname),
-        nodeitems_utils.NodeItem(NodeCompare.bl_idname),
-        nodeitems_utils.NodeItem(NodeReplaceString.bl_idname),
-    ]),
-    DreamTexturesNodeCategory("DREAM_TEXTURES_ANNOTATIONS", "Annotations", items = [
-        nodeitems_utils.NodeItem(NodeAnnotationDepth.bl_idname),
-        nodeitems_utils.NodeItem(NodeAnnotationOpenPose.bl_idname),
-        nodeitems_utils.NodeItem(NodeAnnotationADE20K.bl_idname),
-        nodeitems_utils.NodeItem(NodeAnnotationViewport.bl_idname),
-    ]),
-    DreamTexturesNodeCategory("DREAM_TEXTURES_GROUP", "Group", items = [
-        nodeitems_utils.NodeItem(bpy.types.NodeGroupOutput.__name__),
-    ]),
+    DreamTexturesNodeCategory("DREAM_TEXTURES_PIPELINE", "Pipeline", items=pipeline_items),
+    DreamTexturesNodeCategory("DREAM_TEXTURES_INPUT", "Input", items=input_items),
+    DreamTexturesNodeCategory("DREAM_TEXTURES_UTILITY", "Utilities", items=utility_items),
+    DreamTexturesNodeCategory("DREAM_TEXTURES_ANNOTATIONS", "Annotations", items=annotations_items),
+    DreamTexturesNodeCategory("DREAM_TEXTURES_GROUP", "Group", items=group_items),
 ]
 
 def register():
@@ -94,6 +109,7 @@ def register():
     bpy.utils.register_class(NodeRenderProperties)
 
     bpy.utils.register_class(NodeAnnotationDepth)
+    bpy.utils.register_class(NodeAnnotationNormal)
     bpy.utils.register_class(NodeAnnotationOpenPose)
     bpy.utils.register_class(NodeAnnotationADE20K)
     bpy.utils.register_class(NodeAnnotationViewport)
@@ -144,6 +160,7 @@ def unregister():
     bpy.utils.unregister_class(NodeRenderProperties)
 
     bpy.utils.unregister_class(NodeAnnotationDepth)
+    bpy.utils.unregister_class(NodeAnnotationNormal)
     bpy.utils.unregister_class(NodeAnnotationOpenPose)
     bpy.utils.unregister_class(NodeAnnotationADE20K)
     bpy.utils.unregister_class(NodeAnnotationViewport)