Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPencil: Fix unreported move to layer with lock material

Browse Source 
The strokes with the material locked could be moved. Now the lock is respected.
This commit is contained in:
Antonio Vazquez
2020-02-17 10:49:27 +01:00
parent a6755f2f1f
commit 340f452da8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/gpencil/gpencil_edit.c
View File

@@ -1441,7 +1441,8 @@ void GPENCIL_OT_paste(wmOperatorType *ot)
static int gp_move_to_layer_exec(bContext *C, wmOperator *op) static int gp_move_to_layer_exec(bContext *C, wmOperator *op)
{ {
bGPdata *gpd = CTX_data_gpencil_data(C); Object *ob = CTX_data_active_object(C);
bGPdata *gpd = (bGPdata *)ob->data;
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
bGPDlayer *target_layer = NULL; bGPDlayer *target_layer = NULL;
ListBase strokes = {NULL, NULL}; ListBase strokes = {NULL, NULL};
@@ -1492,6 +1493,11 @@ static int gp_move_to_layer_exec(bContext *C, wmOperator *op)
continue; continue;
} }
/* Check if the color is editable. */
if (ED_gpencil_stroke_color_use(ob, gpl, gps) == false) {
continue;
}
/* TODO: Don't just move entire strokes - instead, only copy the selected portions... */ /* TODO: Don't just move entire strokes - instead, only copy the selected portions... */
if (gps->flag & GP_STROKE_SELECT) { if (gps->flag & GP_STROKE_SELECT) {
BLI_remlink(&gpf->strokes, gps); BLI_remlink(&gpf->strokes, gps);