[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35357] trunk/blender/release/scripts/ui/ properties_data_armature.py: 2.5 Armature Panel UI Script:
Thomas Dinges
blender at dingto.de
Fri Mar 4 20:57:05 CET 2011
Revision: 35357
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35357
Author: dingto
Date: 2011-03-04 19:57:05 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
2.5 Armature Panel UI Script:
* Code cleanup, no layout changes.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_data_armature.py
Modified: trunk/blender/release/scripts/ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature.py 2011-03-04 18:39:58 UTC (rev 35356)
+++ trunk/blender/release/scripts/ui/properties_data_armature.py 2011-03-04 19:57:05 UTC (rev 35357)
@@ -58,26 +58,19 @@
layout.prop(arm, "pose_position", expand=True)
- split = layout.split()
-
- col = split.column()
+ col = layout.column()
col.label(text="Layers:")
col.prop(arm, "layers", text="")
col.label(text="Protected Layers:")
col.prop(arm, "layers_protected", text="")
- col.label(text="Deform:")
+ layout.label(text="Deform:")
+ flow = layout.column_flow()
+ flow.prop(arm, "use_deform_vertex_groups", text="Vertex Groups")
+ flow.prop(arm, "use_deform_envelopes", text="Envelopes")
+ flow.prop(arm, "use_deform_preserve_volume", text="Quaternion")
- split = layout.split()
- col = split.column()
- col.prop(arm, "use_deform_vertex_groups", text="Vertex Groups")
- col.prop(arm, "use_deform_envelopes", text="Envelopes")
-
- col = split.column()
- col.prop(arm, "use_deform_preserve_volume", text="Quaternion")
-
-
class DATA_PT_display(ArmatureButtonsPanel, bpy.types.Panel):
bl_label = "Display"
@@ -87,7 +80,7 @@
ob = context.object
arm = context.armature
- layout.row().prop(arm, "draw_type", expand=True)
+ layout.prop(arm, "draw_type", expand=True)
split = layout.split()
@@ -137,10 +130,10 @@
col.prop(group, "color_set")
if group.color_set:
col = split.column()
- subrow = col.row(align=True)
- subrow.prop(group.colors, "normal", text="")
- subrow.prop(group.colors, "select", text="")
- subrow.prop(group.colors, "active", text="")
+ sub = col.row(align=True)
+ sub.prop(group.colors, "normal", text="")
+ sub.prop(group.colors, "select", text="")
+ sub.prop(group.colors, "active", text="")
row = layout.row()
row.active = (ob.proxy is None)
@@ -168,8 +161,7 @@
ob = context.object
poselib = ob.pose_library
- row = layout.row()
- row.template_ID(ob, "pose_library", new="poselib.new", unlink="poselib.unlink")
+ layout.template_ID(ob, "pose_library", new="poselib.new", unlink="poselib.unlink")
if poselib:
row = layout.row()
@@ -190,8 +182,7 @@
col.operator("poselib.pose_remove", icon='ZOOMOUT', text="").pose = pose_marker_active.name
col.operator("poselib.apply_pose", icon='ZOOM_SELECTED', text="").pose_index = poselib.pose_markers.active_index
- row = layout.row()
- row.operator("poselib.action_sanitise")
+ layout.operator("poselib.action_sanitise")
# TODO: this panel will soon be depreceated too
@@ -207,16 +198,15 @@
split = layout.split()
- col = split.column()
+ col = split.column(align=True)
- sub = col.column(align=True)
if arm.ghost_type == 'RANGE':
- sub.prop(arm, "ghost_frame_start", text="Start")
- sub.prop(arm, "ghost_frame_end", text="End")
- sub.prop(arm, "ghost_size", text="Step")
+ col.prop(arm, "ghost_frame_start", text="Start")
+ col.prop(arm, "ghost_frame_end", text="End")
+ col.prop(arm, "ghost_size", text="Step")
elif arm.ghost_type == 'CURRENT_FRAME':
- sub.prop(arm, "ghost_step", text="Range")
- sub.prop(arm, "ghost_size", text="Step")
+ col.prop(arm, "ghost_step", text="Range")
+ col.prop(arm, "ghost_size", text="Step")
col = split.column()
col.label(text="Display:")
@@ -236,11 +226,9 @@
layout = self.layout
ob = context.object
-
itasc = ob.pose.ik_param
- row = layout.row()
- row.prop(ob.pose, "ik_solver")
+ layout.prop(ob.pose, "ik_solver")
if itasc:
layout.prop(itasc, "mode", expand=True)
@@ -249,14 +237,11 @@
layout.label(text="Reiteration:")
layout.prop(itasc, "reiteration_method", expand=True)
- split = layout.split()
- split.active = not simulation or itasc.reiteration_method != 'NEVER'
- col = split.column()
- col.prop(itasc, "precision")
+ row = layout.row()
+ row.active = not simulation or itasc.reiteration_method != 'NEVER'
+ row.prop(itasc, "precision")
+ row.prop(itasc, "iterations")
- col = split.column()
- col.prop(itasc, "iterations")
-
if simulation:
layout.prop(itasc, "use_auto_step")
row = layout.row()
More information about the Bf-blender-cvs
mailing list