Merge branch 'master' into xr-dev

amaranth/__init__.py

@@ -74,8 +74,8 @@ 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, 8),
-    "blender": (2, 81, 0),
+    "version": (1, 0, 10),
+    "blender": (3, 2, 0),
     "location": "Everywhere!",
     "description": "A collection of tools and settings to improve productivity",
     "warning": "",

amaranth/node_editor/display_image.py

@@ -20,15 +20,20 @@ image_nodes = ("CompositorNodeRLayers",
                "CompositorNodeViewer",
                "CompositorNodeComposite",
                "ShaderNodeTexImage",
-               "ShaderNodeTexEnvironment")
+               "ShaderNodeTexEnvironment",
+               "GeometryNodeImageTexture")
 
 
 class AMTH_NODE_OT_show_active_node_image(bpy.types.Operator):
     """Show active image node image in the image editor"""
     bl_idname = "node.show_active_node_image"
-    bl_label = "Show Active Node Node"
+    bl_label = "Preview Image from Node"
     bl_options = {"UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return context.active_node is not None
+
     def execute(self, context):
         return {'FINISHED'}
 
@@ -66,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'}

io_scene_gltf2/__init__.py

@@ -4,7 +4,7 @@
 bl_info = {
     'name': 'glTF 2.0 format',
     'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (3, 2, 37),
+    "version": (3, 3, 0),
     'blender': (3, 1, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',

rigify/rigs/limbs/leg.py

@@ -98,9 +98,13 @@ class Rig(BaseLimbRig):
     #     Toe spin control.
     #   heel:
     #     Foot roll control
+    #   ik_toe:
+    #     If enabled, toe control for IK chain.
     # mch:
     #   heel[]:
     #     Chain of bones implementing foot roll.
+    #   ik_toe_parent:
+    #      If using split IK toe, parent of the IK toe control.
     #
     ####################################################
 
@@ -208,21 +212,35 @@ class Rig(BaseLimbRig):
     @stage.generate_bones
     def make_ik_toe_control(self):
         if self.use_ik_toe:
-            self.bones.ctrl.ik_toe = self.make_ik_toe_control_bone(self.bones.org.main[3])
+            toe = self.bones.org.main[3]
+            self.bones.ctrl.ik_toe = self.make_ik_toe_control_bone(toe)
+            self.bones.mch.ik_toe_parent = self.make_ik_toe_parent_mch_bone(toe)
 
     def make_ik_toe_control_bone(self, org):
         return self.copy_bone(org, make_derived_name(org, 'ctrl', '_ik'))
 
+    def make_ik_toe_parent_mch_bone(self, org):
+        return self.copy_bone(org, make_derived_name(org, 'mch', '_ik_parent'), scale=1/3)
+
     @stage.parent_bones
     def parent_ik_toe_control(self):
         if self.use_ik_toe:
-            self.set_bone_parent(self.bones.ctrl.ik_toe, self.get_mch_heel_toe_output())
+            mch = self.bones.mch
+            align_bone_orientation(self.obj, mch.ik_toe_parent, self.get_mch_heel_toe_output())
+
+            self.set_bone_parent(mch.ik_toe_parent, mch.ik_target, use_connect=True)
+            self.set_bone_parent(self.bones.ctrl.ik_toe, mch.ik_toe_parent)
 
     @stage.configure_bones
     def configure_ik_toe_control(self):
         if self.use_ik_toe:
             self.copy_bone_properties(self.bones.org.main[3], self.bones.ctrl.ik_toe, props=False)
 
+    @stage.rig_bones
+    def rig_ik_toe_control(self):
+        if self.use_ik_toe:
+            self.make_constraint(self.bones.mch.ik_toe_parent, 'COPY_TRANSFORMS', self.get_mch_heel_toe_output())
+
     @stage.generate_widgets
     def make_ik_toe_control_widget(self):
         if self.use_ik_toe: