diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-11-28 06:49:45 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-11-28 06:49:45 +0300 |
| commit | 54c5859578362976cc54b4e04f0a513117b4698e (patch) | |
| tree | c377ed51fd218982da61a960c4e5f572c91ab2df /source/blender/editors/space_view3d/view3d_buttons.c | |
| parent | c6b4c2716a5fb2784b9b2ddc5ec555ff68a2d24b (diff) | |
Durian Rigging Requests: (Armature Layers + Rotation Locking Tweaks)
* Increased the number of Armature and Bone Layers from 16 to 32. Please note that older versions of Blender may not correctly resolve the layers that bones are on when loading new files.
* Newly added objects are now made by default to allow locking of 4-component rotations using 4 separate locks (i.e. one by component) instead of requiring the obscure 'W' toggle (renamed '4L' now) to be enabled first. The objects in the default scene need modifying manually though.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_buttons.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 0eddeba6ff9..a988ceb50e7 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -521,40 +521,35 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) split = uiLayoutSplit(layout, 0.8); switch(RNA_enum_get(ptr, "rotation_mode")) { - case ROT_MODE_XYZ: - case ROT_MODE_XZY: - case ROT_MODE_YXZ: - case ROT_MODE_YZX: - case ROT_MODE_ZXY: - case ROT_MODE_ZYX: - colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, "Rotation", 0, ptr, "rotation_euler", 0); - colsub = uiLayoutColumn(split, 1); - uiItemL(colsub, "", 0); - uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY); - break; - case ROT_MODE_QUAT: + case ROT_MODE_QUAT: /* quaternion */ colsub = uiLayoutColumn(split, 1); uiItemR(colsub, "Rotation", 0, ptr, "rotation_quaternion", 0); colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, "W", 0, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE); + uiItemR(colsub, "4L", 0, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE); if (RNA_boolean_get(ptr, "lock_rotations_4d")) uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY); else uiItemL(colsub, "", 0); uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY); break; - case ROT_MODE_AXISANGLE: + case ROT_MODE_AXISANGLE: /* axis angle */ colsub = uiLayoutColumn(split, 1); uiItemR(colsub, "Rotation", 0, ptr, "rotation_axis_angle", 0); colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, "W", 0, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE); + uiItemR(colsub, "4L", 0, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE); if (RNA_boolean_get(ptr, "lock_rotations_4d")) uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY); else uiItemL(colsub, "", 0); uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY); break; + default: /* euler rotations */ + colsub = uiLayoutColumn(split, 1); + uiItemR(colsub, "Rotation", 0, ptr, "rotation_euler", 0); + colsub = uiLayoutColumn(split, 1); + uiItemL(colsub, "", 0); + uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY); + break; } uiItemR(layout, "", 0, ptr, "rotation_mode", 0); |