diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-06 08:31:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-06 08:31:27 +0300 |
| commit | 0198b85ab97647c044f8bf0e6e2cceed87bd5ec2 (patch) | |
| tree | 51d7cfe41318c1ad48b691235665717855eb5a64 /source/blender/editors/gpencil | |
| parent | 7613d36b2afed5f3dd460fd817b443b5645be234 (diff) | |
[#25030] Grease Pencil active_frame_delete() deletes wrong layer
move buttons to the header since they only operate on the active layer.
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_buttons.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index 87a9c3cd52f..f0b2f960a8d 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -210,10 +210,6 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", 0); uiItemR(subcol, &ptr, "ghost_range_max", 0, "Frames", 0); // XXX shorter name here? i.e. GStep - /* additional options... */ - subcol= uiLayoutColumn(col, 1); - uiItemO(subcol, "Delete Frame", 0, "GPENCIL_OT_active_frame_delete"); - uiItemO(subcol, "Convert...", 0, "GPENCIL_OT_convert"); } } @@ -242,8 +238,11 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", NULL, "GPENCIL_OT_data_unlink"); /* add new layer button - can be used even when no data, since it can add a new block too */ - uiItemO(col, NULL, 0, "GPENCIL_OT_layer_add"); - + uiItemO(col, "New Layer", 0, "GPENCIL_OT_layer_add"); + row= uiLayoutRow(col, 1); + uiItemO(row, "Delete Frame", 0, "GPENCIL_OT_active_frame_delete"); + uiItemO(row, "Convert", 0, "GPENCIL_OT_convert"); + /* sanity checks... */ if (gpd == NULL) return; |