diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-11-23 20:17:12 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-11-23 20:17:12 +0400 |
| commit | 39dc956f593b3406bf1d81fb83c557b7b51f5327 (patch) | |
| tree | 50b59815aad48902a6563aefc8b944daf34c401e /release/scripts/startup/bl_ui/properties_data_armature.py | |
| parent | 5d5176095e82b34499e15d74f1fb76d56f4d9508 (diff) | |
| parent | d846c9a3b75c3d6f20bc7ab7d2da6cdd18bbbef2 (diff) | |
Merge branch 'master' into soc-2013-rigid_body_simsoc-2013-rigid_body_sim
Conflicts:
intern/rigidbody/CMakeLists.txt
release/datafiles/splash.png
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_view3d_types.h
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_data_armature.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_armature.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index e01764a5496..a274453a472 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -121,9 +121,9 @@ class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel): row = layout.row() - rows = 2 + rows = 1 if group: - rows = 5 + 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) @@ -184,7 +184,7 @@ class DATA_PT_pose_library(ArmatureButtonsPanel, Panel): # list of poses in pose library row = layout.row() row.template_list("UI_UL_list", "pose_markers", poselib, "pose_markers", - poselib.pose_markers, "active_index", rows=5) + poselib.pose_markers, "active_index", rows=3) # column of operators for active pose # - goes beside list |