diff --git a/amaranth/__init__.py b/amaranth/__init__.py index 998c71e7b74a93673f2414136f3bcbcd41f90b2d..06a42c8eca0703360e622dacc603ef29ae07d931 100644 --- a/amaranth/__init__.py +++ b/amaranth/__init__.py @@ -74,7 +74,7 @@ from amaranth.misc import ( bl_info = { "name": "Amaranth Toolset", "author": "Pablo Vazquez, Bassam Kurdali, Sergey Sharybin, Lukas Tönne, Cesar Saez, CansecoGPC", - "version": (1, 0, 9), + "version": (1, 0, 10), "blender": (3, 2, 0), "location": "Everywhere!", "description": "A collection of tools and settings to improve productivity", diff --git a/amaranth/node_editor/display_image.py b/amaranth/node_editor/display_image.py index 77b081b289ea5df3ce8e9bd9a0f37850495497b2..e0d68190d4ffcf9b4eabba548a5d030d2d07695b 100644 --- a/amaranth/node_editor/display_image.py +++ b/amaranth/node_editor/display_image.py @@ -20,7 +20,8 @@ image_nodes = ("CompositorNodeRLayers", "CompositorNodeViewer", "CompositorNodeComposite", "ShaderNodeTexImage", - "ShaderNodeTexEnvironment") + "ShaderNodeTexEnvironment", + "GeometryNodeImageTexture") class AMTH_NODE_OT_show_active_node_image(bpy.types.Operator): @@ -70,8 +71,17 @@ class AMTH_NODE_OT_show_active_node_image(bpy.types.Operator): elif active_node.bl_idname in ["CompositorNodeComposite", "CompositorNodeRLayers"]: space.image = bpy.data.images[ "Render Result"] + elif active_node.bl_idname == "GeometryNodeImageTexture": + if active_node.inputs['Image'].is_linked: + self.report({'INFO'}, "Previewing linked sockets is not supported yet") + break + if active_node.inputs['Image'].default_value: + space.image = active_node.inputs['Image'].default_value elif active_node.image: space.image = active_node.image + else: + self.report({'INFO'}, "No image detected") + break break else: return {'CANCELLED'}