diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-13 15:52:37 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-13 15:52:37 +0400 |
commit | 83ca561b6283b20c23b8ae453b91e6bfdfc6836d (patch) | |
tree | 249a99acd06fe99ba196f6b34db2091e2ac88069 /source | |
parent | cf485cd9638825ab911d8eb4cf06f02ae189c864 (diff) |
Fix #27951: armature edit mode transform panel shows "nothing selected" even
when something is selected.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 549a547b846..ef7ada85843 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -966,13 +966,13 @@ static void v3d_editarmature_buts(uiLayout *layout, Object *ob) ebone= arm->act_edbone; - if (!ebone || (ebone->layer & arm->layer)==0) + if (!ebone || (ebone->layer & arm->layer)==0) { + uiItemL(col, "Nothing selected", ICON_NONE); return; - + } // row= uiLayoutRow(layout, 0); RNA_pointer_create(&arm->id, &RNA_EditBone, ebone, &eboneptr); - col= uiLayoutColumn(layout, 0); uiItemR(col, &eboneptr, "head", 0, "Head", ICON_NONE); if (ebone->parent && ebone->flag & BONE_CONNECTED ) { @@ -1256,7 +1256,7 @@ static void view3d_panel_object(const bContext *C, Panel *pa) if(ob==obedit) { if(ob->type==OB_ARMATURE) v3d_editarmature_buts(col, ob); - if(ob->type==OB_MBALL) v3d_editmetaball_buts(col, ob); + else if(ob->type==OB_MBALL) v3d_editmetaball_buts(col, ob); else v3d_editvertex_buts(col, v3d, ob, lim); } else if(ob->mode & OB_MODE_POSE) { |