Merge branch 'master' into greasepencil-edit-curve

9 files changed, 29 insertions, 51 deletions

diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 01cf2f810ad084cb4e2dad6dc7f82f3bc05f2a0
+Subproject 49c39f59fbc464dd34388990123f271c39eacbf
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject f2f4a8b3bfa36ee49f7bdb3a1acb40ef4b39ee3
+Subproject a52733b58d95ce60ecde95a9eca242e7319c285
diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py
index f70f1eacead..cef03a1eb08 100644
--- a/release/scripts/modules/bpy_extras/mesh_utils.py
+++ b/release/scripts/modules/bpy_extras/mesh_utils.py
@@ -268,7 +268,8 @@ def ngon_tessellate(from_data, indices, fix_loops=True, debug_print=True):
         # Manhatten length of a vector, faster then length.
         return abs(co[0]) + abs(co[1]) + abs(co[2])
 
-    def vert_treplet(v, i):
+    def vert_from_vector_with_extra_data(v, i):
+        # Calculate data per-vector, for reuse.
         return v, vector_to_tuple(v, 6), i, mlen(v)
 
     def ed_key_mlen(v1, v2):
@@ -298,12 +299,12 @@ def ngon_tessellate(from_data, indices, fix_loops=True, debug_print=True):
 
         if type(from_data) in {tuple, list}:
             verts = [
-                vert_treplet(Vector(from_data[i]), ii)
+                vert_from_vector_with_extra_data(Vector(from_data[i]), ii)
                 for ii, i in enumerate(indices)
             ]
         else:
             verts = [
-                vert_treplet(from_data.vertices[i].co, ii)
+                vert_from_vector_with_extra_data(from_data.vertices[i].co, ii)
                 for ii, i in enumerate(indices)
             ]
 
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 95e86b480aa..ab3f3e39658 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5011,6 +5011,7 @@ def km_transform_modal_map(_params):
         ("AUTOIK_CHAIN_LEN_DOWN", {"type": 'WHEELUPMOUSE', "value": 'PRESS', "shift": True}, None),
         ("INSERTOFS_TOGGLE_DIR", {"type": 'T', "value": 'PRESS', "repeat": False}, None),
         ("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "repeat": False}, None),
+        ("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "repeat": False, "shift": True}, None),
     ])
 
     return keymap
diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
index ef85b45d41a..bb921565374 100644
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@ -3936,6 +3936,7 @@ def km_transform_modal_map(_params):
         ("AUTOIK_CHAIN_LEN_DOWN", {"type": 'WHEELUPMOUSE', "value": 'PRESS', "shift": True}, None),
         ("INSERTOFS_TOGGLE_DIR", {"type": 'T', "value": 'PRESS'}, None),
         ("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
+        ("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
     ])
 
     return keymap
diff --git a/release/scripts/startup/bl_operators/add_mesh_torus.py b/release/scripts/startup/bl_operators/add_mesh_torus.py
index edcd52c12bd..c2f9a4189cf 100644
--- a/release/scripts/startup/bl_operators/add_mesh_torus.py
+++ b/release/scripts/startup/bl_operators/add_mesh_torus.py
@@ -149,7 +149,7 @@ class AddTorus(Operator, object_utils.AddObjectHelper):
         default=12,
     )
     mode: EnumProperty(
-        name="Torus Dimensions",
+        name="Dimensions Mode",
         items=(
             ('MAJOR_MINOR', "Major/Minor",
              "Use the major/minor radii for torus dimensions"),
@@ -204,47 +204,30 @@ class AddTorus(Operator, object_utils.AddObjectHelper):
     def draw(self, _context):
         layout = self.layout
 
-        col = layout.column(align=True)
-        col.prop(self, "generate_uvs")
-        col.separator()
-        col.prop(self, "align")
+        layout.use_property_split = True
+        layout.use_property_decorate = False
 
-        col = layout.column(align=True)
-        col.label(text="Location")
-        col.prop(self, "location", text="")
+        layout.separator()
 
-        col = layout.column(align=True)
-        col.label(text="Rotation")
-        col.prop(self, "rotation", text="")
+        layout.prop(self, "major_segments")
+        layout.prop(self, "minor_segments")
 
-        col = layout.column(align=True)
-        col.label(text="Major Segments")
-        col.prop(self, "major_segments", text="")
-
-        col = layout.column(align=True)
-        col.label(text="Minor Segments")
-        col.prop(self, "minor_segments", text="")
-
-        col = layout.column(align=True)
-        col.label(text="Torus Dimensions")
-        col.row().prop(self, "mode", expand=True)
+        layout.separator()
 
+        layout.prop(self, "mode")
         if self.mode == 'MAJOR_MINOR':
-            col = layout.column(align=True)
-            col.label(text="Major Radius")
-            col.prop(self, "major_radius", text="")
-
-            col = layout.column(align=True)
-            col.label(text="Minor Radius")
-            col.prop(self, "minor_radius", text="")
+            layout.prop(self, "major_radius")
+            layout.prop(self, "minor_radius")
         else:
-            col = layout.column(align=True)
-            col.label(text="Exterior Radius")
-            col.prop(self, "abso_major_rad", text="")
+            layout.prop(self, "abso_major_rad")
+            layout.prop(self, "abso_minor_rad")
+
+        layout.separator()
 
-            col = layout.column(align=True)
-            col.label(text="Interior Radius")
-            col.prop(self, "abso_minor_rad", text="")
+        layout.prop(self, "generate_uvs")
+        layout.prop(self, "align")
+        layout.prop(self, "location")
+        layout.prop(self, "rotation")
 
     def invoke(self, context, _event):
         object_utils.object_add_grid_scale_apply_operator(self, context)
diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py
index b47d4223372..da35ea680b8 100644
--- a/release/scripts/startup/bl_ui/properties_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_constraint.py
@@ -114,11 +114,7 @@ class ConstraintButtonsPanel(Panel):
                 col.prop_search(con, "subtarget", con.target, "vertex_groups", text="Vertex Group")
 
     def get_constraint(self, context):
-        con = None
-        if context.pose_bone:
-            con = context.pose_bone.constraints[self.list_panel_index]
-        else:
-            con = context.object.constraints[self.list_panel_index]
+        con = self.custom_data
         self.layout.context_pointer_set("constraint", con)
         return con
 
@@ -963,11 +959,7 @@ class ConstraintButtonsSubPanel(Panel):
     bl_options = {'DRAW_BOX'}
 
     def get_constraint(self, context):
-        con = None
-        if context.pose_bone:
-            con = context.pose_bone.constraints[self.list_panel_index]
-        else:
-            con = context.object.constraints[self.list_panel_index]
+        con = self.custom_data
         self.layout.context_pointer_set("constraint", con)
         return con
 
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index 22f455fe5be..df4793cab19 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -385,8 +385,8 @@ class SCENE_PT_rigid_body_world_settings(RigidBodySubPanel, Panel):
             col.prop(rbw, "use_split_impulse")
 
             col = col.column()
-            col.prop(rbw, "steps_per_second", text="Steps Per Second")
-            col.prop(rbw, "solver_iterations", text="Solver Iterations")
+            col.prop(rbw, "substeps_per_frame")
+            col.prop(rbw, "solver_iterations")
 
 
 class SCENE_PT_rigid_body_cache(RigidBodySubPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 4dee0ddef6a..c31e689f0ae 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -6516,7 +6516,7 @@ class VIEW3D_PT_overlay_vertex_paint(Panel):
         col = layout.column()
         col.active = display_all
 
-        col.prop(overlay, "vertex_paint_mode_opacity", text="Opacity")
+        col.prop(overlay, "vertex_paint_mode_opacity")
         col.prop(overlay, "show_paint_wire")