[Bf-blender-cvs] [3a6cc81] BendyBones: Bendy Bones: Tweaks to UI layout for Bendy Bones panel

[Joshua Leung]

Commit: 3a6cc8105c1f4c1527285be4d52f212eb18401db
Author: Joshua Leung
Date:   Sat May 14 12:44:00 2016 +1200
Branches: BendyBones
https://developer.blender.org/rB3a6cc8105c1f4c1527285be4d52f212eb18401db

Bendy Bones: Tweaks to UI layout for Bendy Bones panel

* Disable all properties if no segments
* Better labels and spacing of items
* Changed order of things to have a better layout
* Moved "inherit endroll" option into this panel too

===================================================================

M	release/scripts/startup/bl_ui/properties_data_bone.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index be74e07..5e358fa 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -147,8 +147,8 @@ class BONE_PT_transform_locks(BoneButtonsPanel, Panel):
 
 
 class BONE_PT_curved(BoneButtonsPanel, Panel):
-    bl_label = "Curved Bones"
-    bl_options = {'DEFAULT_CLOSED'}
+    bl_label = "Bendy Bones"
+    #bl_options = {'DEFAULT_CLOSED'}
 
     def draw(self, context):
         ob = context.object
@@ -166,30 +166,38 @@ class BONE_PT_curved(BoneButtonsPanel, Panel):
             bbone = bone
 
         layout = self.layout
-        row = layout.row()
+        layout.prop(bone, "bbone_segments", text="Segments")
 
-        col = row.column()
-        col.prop(bone, "bbone_segments", text="Segments")
-
-        sub = col.column(align=True)
-        sub.prop(bone, "bbone_in", text="Ease In")    # XXX: have this also be an overlay?
-        sub.prop(bone, "bbone_out", text="Ease Out")  # XXX: have this also be an overlay?
-        sub.prop(bbone, "bbone_rollin", text="Roll In")
-        sub.prop(bbone, "bbone_rollout", text="Roll Out")
+        col = layout.column()
+        col.active = bone.bbone_segments > 1
 
-        col = row.column()
-        sub = col.column(align=True)
-        sub.label(text="Curve XY Roll:")
+        row = col.row()
+        sub = row.column(align=True)
+        sub.label(text="Curve XY Offsets:")
         sub.prop(bbone, "bbone_curveinx", text="In X")
         sub.prop(bbone, "bbone_curveiny", text="In Y")
         sub.prop(bbone, "bbone_curveoutx", text="Out X")
         sub.prop(bbone, "bbone_curveouty", text="Out Y")
 
-        sub = col.column(align=True)
-        sub.label(text="Scale In/Out:")
+        sub = row.column(align=True)
+        sub.label("Roll:")
+        sub.prop(bbone, "bbone_rollin", text="In")
+        sub.prop(bbone, "bbone_rollout", text="Out")
+        sub.prop(bone, "use_endroll_as_inroll")
+
+        row = col.row()
+        sub = row.column(align=True)
+        sub.label(text="Scale:")
         sub.prop(bbone, "bbone_scalein", text="Scale In")
         sub.prop(bbone, "bbone_scaleout", text="Scale Out")
 
+        sub = row.column(align=True)
+        sub.label("Easing:")
+        sub.prop(bone, "bbone_in", text="Ease In")    # XXX: have this also be an overlay?
+        sub.prop(bone, "bbone_out", text="Ease Out")  # XXX: have this also be an overlay?
+
+
+
 
 class BONE_PT_relations(BoneButtonsPanel, Panel):
     bl_label = "Relations"
@@ -233,7 +241,6 @@ class BONE_PT_relations(BoneButtonsPanel, Panel):
         sub.prop(bone, "use_connect")
         sub.prop(bone, "use_inherit_rotation")
         sub.prop(bone, "use_inherit_scale")
-        sub.prop(bone, "use_endroll_as_inroll")
         sub = col.column()
         sub.active = (not bone.parent or not bone.use_connect)
         sub.prop(bone, "use_local_location")