griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2025-10-17 16:42:22 +02:00
parent 7e4eed8777 acb20247a5
commit aab29c1ba6
9 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/addons_core/rigify/operators/action_layers.py
View File

@@ -107,7 +107,7 @@ class ActionSlot(PropertyGroup, ActionSlotBase):
return str(action_slot.handle)
action_slot_ui: StringProperty(
name="Acion Slot",
name="Action Slot",
description="Slot of the Action to use for the Action Constraints",
# These callbacks let us store the action slot's `handle` property
# under the hood (which is unique and never changes), while acting

8
scripts/startup/bl_operators/node.py
View File

@@ -669,12 +669,12 @@ class NODE_OT_add_zone(NodeAddZoneOperator, Operator):
input_node_type: StringProperty(
name="Input Node",
description="Specifies the input node used the created zone",
description="Specifies the input node used by the created zone",
)
output_node_type: StringProperty(
name="Output Node",
description="Specifies the output node used the created zone",
description="Specifies the output node used by the created zone",
)
add_default_geometry_link: BoolProperty(
@@ -691,12 +691,12 @@ class NODE_OT_swap_zone(ZoneOperator, NodeSwapOperator, Operator):
input_node_type: StringProperty(
name="Input Node",
description="Specifies the input node used the created zone",
description="Specifies the input node used by the created zone",
)
output_node_type: StringProperty(
name="Output Node",
description="Specifies the output node used the created zone",
description="Specifies the output node used by the created zone",
)
add_default_geometry_link: BoolProperty(

2
scripts/startup/bl_operators/wm.py
View File

@@ -1342,7 +1342,7 @@ class WM_OT_doc_view_manual(Operator):
self.report(
{'WARNING'},
rpt_("No reference available {!r}, "
"Update info in '_rna_manual_reference.py' "
"update info in '_rna_manual_reference.py' "
"or callback to bpy.utils.manual_map()").format(self.doc_id)
)
return {'CANCELLED'}

9
scripts/startup/bl_ui/properties_data_mesh.py
View File

@@ -294,9 +294,6 @@ def draw_shape_key_properties(context, layout):
row.active = enable_edit_value
row.prop(key, "eval_time")
if ob.type == 'MESH':
layout.prop(ob, "add_rest_position_attribute")
class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
bl_label = "Shape Keys"
@@ -338,6 +335,12 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
col.menu("MESH_MT_shape_key_context_menu", icon='DOWNARROW_HLT', text="")
if ob.type == 'MESH':
row = layout.row(align=True)
row.use_property_split = False
row.alignment = 'LEFT'
row.prop(ob, "add_rest_position_attribute")
if kb:
col.separator()