This commit implements described in the #104573. The goal is to fix the confusion of the submodule hashes change, which are not ideal for any of the supported git-module configuration (they are either always visible causing confusion, or silently staged and committed, also causing confusion). This commit replaces submodules with a checkout of addons and addons_contrib, covered by the .gitignore, and locale and developer tools are moved to the main repository. This also changes the paths: - /release/scripts are moved to the /scripts - /source/tools are moved to the /tools - /release/datafiles/locale is moved to /locale This is done to avoid conflicts when using bisect, and also allow buildbot to automatically "recover" wgen building older or newer branches/patches. Running `make update` will initialize the local checkout to the changed repository configuration. Another aspect of the change is that the make update will support Github style of remote organization (origin remote pointing to thy fork, upstream remote pointing to the upstream blender/blender.git). Pull Request #104755
272 lines
7.8 KiB
Python
272 lines
7.8 KiB
Python
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
import bpy
|
|
from bpy.types import Panel, Menu
|
|
from rna_prop_ui import PropertyPanel
|
|
|
|
from bl_ui.properties_animviz import (
|
|
MotionPathButtonsPanel,
|
|
MotionPathButtonsPanel_display,
|
|
)
|
|
|
|
|
|
class ArmatureButtonsPanel:
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
return context.armature
|
|
|
|
|
|
class DATA_PT_context_arm(ArmatureButtonsPanel, Panel):
|
|
bl_label = ""
|
|
bl_options = {'HIDE_HEADER'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
ob = context.object
|
|
arm = context.armature
|
|
space = context.space_data
|
|
|
|
if ob:
|
|
layout.template_ID(ob, "data")
|
|
elif arm:
|
|
layout.template_ID(space, "pin_id")
|
|
|
|
|
|
class DATA_PT_skeleton(ArmatureButtonsPanel, Panel):
|
|
bl_label = "Skeleton"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
arm = context.armature
|
|
|
|
layout.row().prop(arm, "pose_position", expand=True)
|
|
|
|
col = layout.column()
|
|
col.label(text="Layers:")
|
|
col.prop(arm, "layers", text="")
|
|
col.label(text="Protected Layers:")
|
|
col.prop(arm, "layers_protected", text="")
|
|
|
|
|
|
class DATA_PT_display(ArmatureButtonsPanel, Panel):
|
|
bl_label = "Viewport Display"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
ob = context.object
|
|
arm = context.armature
|
|
|
|
layout.prop(arm, "display_type", text="Display As")
|
|
|
|
col = layout.column(heading="Show")
|
|
col.prop(arm, "show_names", text="Names")
|
|
col.prop(arm, "show_bone_custom_shapes", text="Shapes")
|
|
col.prop(arm, "show_group_colors", text="Group Colors")
|
|
|
|
if ob:
|
|
col.prop(ob, "show_in_front", text="In Front")
|
|
|
|
col = layout.column(align=False, heading="Axes")
|
|
row = col.row(align=True)
|
|
row.prop(arm, "show_axes", text="")
|
|
sub = row.row(align=True)
|
|
sub.active = arm.show_axes
|
|
sub.prop(arm, "axes_position", text="Position")
|
|
|
|
|
|
class DATA_MT_bone_group_context_menu(Menu):
|
|
bl_label = "Bone Group Specials"
|
|
|
|
def draw(self, _context):
|
|
layout = self.layout
|
|
|
|
layout.operator("pose.group_sort", icon='SORTALPHA')
|
|
|
|
|
|
class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel):
|
|
bl_label = "Bone Groups"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
return (context.object and context.object.type == 'ARMATURE' and context.object.pose)
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
ob = context.object
|
|
pose = ob.pose
|
|
group = pose.bone_groups.active
|
|
|
|
row = layout.row()
|
|
|
|
rows = 1
|
|
if group:
|
|
rows = 4
|
|
row.template_list(
|
|
"UI_UL_list",
|
|
"bone_groups",
|
|
pose,
|
|
"bone_groups",
|
|
pose.bone_groups,
|
|
"active_index",
|
|
rows=rows,
|
|
)
|
|
|
|
col = row.column(align=True)
|
|
col.operator("pose.group_add", icon='ADD', text="")
|
|
col.operator("pose.group_remove", icon='REMOVE', text="")
|
|
col.menu("DATA_MT_bone_group_context_menu", icon='DOWNARROW_HLT', text="")
|
|
if group:
|
|
col.separator()
|
|
col.operator("pose.group_move", icon='TRIA_UP', text="").direction = 'UP'
|
|
col.operator("pose.group_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
|
|
|
|
split = layout.split()
|
|
|
|
col = split.column()
|
|
col.prop(group, "color_set")
|
|
if group.color_set:
|
|
col = split.column()
|
|
sub = col.row(align=True)
|
|
sub.enabled = group.is_custom_color_set # only custom colors are editable
|
|
sub.prop(group.colors, "normal", text="")
|
|
sub.prop(group.colors, "select", text="")
|
|
sub.prop(group.colors, "active", text="")
|
|
|
|
row = layout.row()
|
|
|
|
sub = row.row(align=True)
|
|
sub.operator("pose.group_assign", text="Assign")
|
|
# row.operator("pose.bone_group_remove_from", text="Remove")
|
|
sub.operator("pose.group_unassign", text="Remove")
|
|
|
|
sub = row.row(align=True)
|
|
sub.operator("pose.group_select", text="Select")
|
|
sub.operator("pose.group_deselect", text="Deselect")
|
|
|
|
|
|
class DATA_PT_iksolver_itasc(ArmatureButtonsPanel, Panel):
|
|
bl_label = "Inverse Kinematics"
|
|
bl_options = {"DEFAULT_CLOSED"}
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
ob = context.object
|
|
return ob and ob.pose
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
ob = context.object
|
|
itasc = ob.pose.ik_param
|
|
|
|
layout.prop(ob.pose, "ik_solver")
|
|
|
|
if itasc:
|
|
layout.prop(itasc, "mode")
|
|
simulation = (itasc.mode == 'SIMULATION')
|
|
if simulation:
|
|
layout.prop(itasc, "reiteration_method", expand=False)
|
|
|
|
col = layout.column()
|
|
col.active = not simulation or itasc.reiteration_method != 'NEVER'
|
|
col.prop(itasc, "precision")
|
|
col.prop(itasc, "iterations")
|
|
|
|
if simulation:
|
|
col.prop(itasc, "use_auto_step")
|
|
sub = layout.column(align=True)
|
|
if itasc.use_auto_step:
|
|
sub.prop(itasc, "step_min", text="Steps Min")
|
|
sub.prop(itasc, "step_max", text="Max")
|
|
else:
|
|
sub.prop(itasc, "step_count", text="Steps")
|
|
|
|
col.prop(itasc, "solver")
|
|
if simulation:
|
|
col.prop(itasc, "feedback")
|
|
col.prop(itasc, "velocity_max")
|
|
if itasc.solver == 'DLS':
|
|
col.separator()
|
|
col.prop(itasc, "damping_max", text="Damping Max", slider=True)
|
|
col.prop(itasc, "damping_epsilon", text="Damping Epsilon", slider=True)
|
|
|
|
|
|
class DATA_PT_motion_paths(MotionPathButtonsPanel, Panel):
|
|
#bl_label = "Bones Motion Paths"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
bl_context = "data"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
# XXX: include pose-mode check?
|
|
return (context.object) and (context.armature)
|
|
|
|
def draw(self, context):
|
|
# layout = self.layout
|
|
|
|
ob = context.object
|
|
avs = ob.pose.animation_visualization
|
|
|
|
pchan = context.active_pose_bone
|
|
mpath = pchan.motion_path if pchan else None
|
|
|
|
self.draw_settings(context, avs, mpath, bones=True)
|
|
|
|
|
|
class DATA_PT_motion_paths_display(MotionPathButtonsPanel_display, Panel):
|
|
#bl_label = "Bones Motion Paths"
|
|
bl_context = "data"
|
|
bl_parent_id = "DATA_PT_motion_paths"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
# XXX: include pose-mode check?
|
|
return (context.object) and (context.armature)
|
|
|
|
def draw(self, context):
|
|
# layout = self.layout
|
|
|
|
ob = context.object
|
|
avs = ob.pose.animation_visualization
|
|
|
|
pchan = context.active_pose_bone
|
|
mpath = pchan.motion_path if pchan else None
|
|
|
|
self.draw_settings(context, avs, mpath, bones=True)
|
|
|
|
|
|
class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, Panel):
|
|
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', 'BLENDER_WORKBENCH_NEXT'}
|
|
_context_path = "object.data"
|
|
_property_type = bpy.types.Armature
|
|
|
|
|
|
classes = (
|
|
DATA_PT_context_arm,
|
|
DATA_PT_skeleton,
|
|
DATA_MT_bone_group_context_menu,
|
|
DATA_PT_bone_groups,
|
|
DATA_PT_motion_paths,
|
|
DATA_PT_motion_paths_display,
|
|
DATA_PT_display,
|
|
DATA_PT_iksolver_itasc,
|
|
DATA_PT_custom_props_arm,
|
|
)
|
|
|
|
if __name__ == "__main__": # only for live edit.
|
|
from bpy.utils import register_class
|
|
for cls in classes:
|
|
register_class(cls)
|