Merge branch 'blender-v4.0-release' into main
This commit is contained in:
@@ -467,22 +467,22 @@ class ARMATURE_OT_sync_bone_color_to_selected(Operator):
|
||||
return context.mode in {'EDIT_ARMATURE', 'POSE'}
|
||||
|
||||
def execute(self, context):
|
||||
match (self.bone_type, context.mode):
|
||||
match(self.bone_type, context.mode):
|
||||
# Armature in edit mode:
|
||||
case ('POSE', 'EDIT_ARMATURE'):
|
||||
case('POSE', 'EDIT_ARMATURE'):
|
||||
self.report({'ERROR'}, "Go to pose mode to copy pose bone colors")
|
||||
return {'OPERATOR_CANCELLED'}
|
||||
case ('EDIT', 'EDIT_ARMATURE'):
|
||||
case('EDIT', 'EDIT_ARMATURE'):
|
||||
bone_source = context.active_bone
|
||||
bones_dest = context.selected_bones
|
||||
pose_bones_to_check = []
|
||||
|
||||
# Armature in pose mode:
|
||||
case ('POSE', 'POSE'):
|
||||
case('POSE', 'POSE'):
|
||||
bone_source = context.active_pose_bone
|
||||
bones_dest = context.selected_pose_bones
|
||||
pose_bones_to_check = []
|
||||
case ('EDIT', 'POSE'):
|
||||
case('EDIT', 'POSE'):
|
||||
bone_source = context.active_bone
|
||||
pose_bones_to_check = context.selected_pose_bones
|
||||
bones_dest = [posebone.bone for posebone in pose_bones_to_check]
|
||||
|
||||
@@ -428,6 +428,7 @@ class SimulationZoneItemMoveOperator(SimulationZoneOperator, ZoneMoveItemOperato
|
||||
bl_label = "Move State Item"
|
||||
bl_options = {'REGISTER', 'UNDO'}
|
||||
|
||||
|
||||
class RepeatZoneOperator(ZoneOperator):
|
||||
input_node_type = 'GeometryNodeRepeatInput'
|
||||
output_node_type = 'GeometryNodeRepeatOutput'
|
||||
|
||||
@@ -1000,6 +1000,7 @@ def draw_socket_item_in_list(uilist, layout, item, icon):
|
||||
layout.alignment = 'CENTER'
|
||||
layout.template_node_socket(color=item.color)
|
||||
|
||||
|
||||
class NODE_UL_simulation_zone_items(bpy.types.UIList):
|
||||
def draw_item(self, context, layout, _data, item, icon, _active_data, _active_propname, _index):
|
||||
draw_socket_item_in_list(self, layout, item, icon)
|
||||
|
||||
@@ -964,7 +964,6 @@ class SEQUENCER_MT_strip_retiming(Menu):
|
||||
)
|
||||
|
||||
|
||||
|
||||
class SEQUENCER_MT_strip(Menu):
|
||||
bl_label = "Strip"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user