1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GPencil: Add support to name new layer when moving to layer

Browse Source 
To make it consistent with collections, now it's possible to name the new layer created using the `Move to Layer` option.

Differential Revision: https://developer.blender.org/D15092
This commit is contained in:
Antonio Vazquez 2022-06-01 18:23:16 +02:00
parent bff9841465
commit 129ea355c8
2 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@ -250,6 +250,7 @@ class GPENCIL_MT_move_to_layer(Menu):
layout.separator() layout.separator()
layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator("gpencil.move_to_layer", text="New Layer", icon='ADD').layer = -1 layout.operator("gpencil.move_to_layer", text="New Layer", icon='ADD').layer = -1

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

@ -1811,7 +1811,16 @@ static int gpencil_move_to_layer_exec(bContext *C, wmOperator *op)
} }
else { else {
/* Create a new layer. */ /* Create a new layer. */
target_layer = BKE_gpencil_layer_addnew(gpd, "GP_Layer", true, false); PropertyRNA *prop;
char name[128];
prop = RNA_struct_find_property(op->ptr, "new_layer_name");
if (RNA_property_is_set(op->ptr, prop)) {
RNA_property_string_get(op->ptr, prop, name);
}
else {
strcpy(name, "GP_Layer");
}
target_layer = BKE_gpencil_layer_addnew(gpd, name, true, false);
} }
if (target_layer == NULL) { if (target_layer == NULL) {
@ -1888,8 +1897,46 @@ static int gpencil_move_to_layer_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
static void layer_new_name_get(bGPdata *gpd, char *rname)
{
int index = 0;
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
if (strstr(gpl->info, "GP_Layer")) {
index++;
}
}
if (index == 0) {
BLI_strncpy(rname, "GP_Layer", 128);
return;
}
char *name = BLI_sprintfN("%.*s.%03d", 128, "GP_Layer", index);
BLI_strncpy(rname, name, 128);
MEM_freeN(name);
}
static int gpencil_move_to_layer_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
Object *ob = CTX_data_active_object(C);
PropertyRNA *prop;
if (RNA_int_get(op->ptr, "layer") == -1) {
prop = RNA_struct_find_property(op->ptr, "new_layer_name");
if (!RNA_property_is_set(op->ptr, prop)) {
char name[MAX_NAME];
bGPdata *gpd = ob->data;
layer_new_name_get(gpd, name);
RNA_property_string_set(op->ptr, prop, name);
return WM_operator_props_dialog_popup(C, op, 200);
}
}
return gpencil_move_to_layer_exec(C, op);
}
void GPENCIL_OT_move_to_layer(wmOperatorType *ot) void GPENCIL_OT_move_to_layer(wmOperatorType *ot)
{ {
PropertyRNA *prop;
/* identifiers */ /* identifiers */
ot->name = "Move Strokes to Layer"; ot->name = "Move Strokes to Layer";
ot->idname = "GPENCIL_OT_move_to_layer"; ot->idname = "GPENCIL_OT_move_to_layer";
@ -1898,15 +1945,20 @@ void GPENCIL_OT_move_to_layer(wmOperatorType *ot)
/* callbacks */ /* callbacks */
ot->exec = gpencil_move_to_layer_exec; ot->exec = gpencil_move_to_layer_exec;
ot->poll = gpencil_stroke_edit_poll; /* XXX? */ ot->invoke = gpencil_move_to_layer_invoke;
ot->poll = gpencil_stroke_edit_poll;
/* flags */ /* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* GPencil layer to use. */ /* GPencil layer to use. */
ot->prop = RNA_def_int( prop = RNA_def_int(ot->srna, "layer", 0, -1, INT_MAX, "Grease Pencil Layer", "", -1, INT_MAX);
ot->srna, "layer", 0, -1, INT_MAX, "Grease Pencil Layer", "", -1, INT_MAX); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
RNA_def_property_flag(ot->prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_string(
ot->srna, "new_layer_name", NULL, MAX_NAME, "Name", "Name of the newly added layer");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
ot->prop = prop;
} }
/** \} */ /** \} */