blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

GP: Invert merge down if layer list is reversed

This commit is contained in:
Antonio Vazquez 2018-10-11 18:49:03 +02:00
parent d6dc8cda8b
commit 070c95dfe4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/gpencil/gpencil_data.c
View File

@ -1083,8 +1083,18 @@ void GPENCIL_OT_layer_isolate(wmOperatorType *ot)
static int gp_merge_layer_exec(bContext *C, wmOperator *op)
{
bGPdata *gpd = ED_gpencil_data_get_active(C);
bGPDlayer *gpl_current = BKE_gpencil_layer_getactive(gpd);
bGPDlayer *gpl_next = gpl_current->next;
const bool reverse = (bool)(U.gp_settings & GP_PAINT_REVERSE_LAYERS);
bGPDlayer *gpl_current = NULL;
bGPDlayer *gpl_next = NULL;
if (!reverse) {
gpl_current = BKE_gpencil_layer_getactive(gpd);
gpl_next = gpl_current->next;
}
else {
gpl_next = BKE_gpencil_layer_getactive(gpd);
gpl_current = gpl_next->prev;
}
if (ELEM(NULL, gpd, gpl_current, gpl_next)) {
BKE_report(op->reports, RPT_ERROR, "No layers to merge");