griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[#25030] Grease Pencil active_frame_delete() deletes wrong layer

Browse Source 
move buttons to the header since they only operate on the active layer.
This commit is contained in:
Campbell Barton
2010-12-06 05:31:27 +00:00
parent 7613d36b2a
commit 0198b85ab9
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/gpencil/gpencil_buttons.c
View File

@@ -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;