blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

GPencil: Rename operator color_select to select_material 

The old name was related to the old palettes.
This commit is contained in:
Antonio Vazquez 2020-03-14 10:30:59 +01:00
parent bb89cc51ec
commit d50d410a70
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,8 +632,8 @@ class GreasePencilMaterialsPanel:
if ob.data.use_stroke_edit_mode:
row = layout.row(align=True)
row.operator("gpencil.stroke_change_color", text="Assign")
row.operator("gpencil.color_select", text="Select").deselect = False
row.operator("gpencil.color_select", text="Deselect").deselect = True
row.operator("gpencil.select_material", text="Select").deselect = False
row.operator("gpencil.select_material", text="Deselect").deselect = True
# stroke color
ma = None
if is_view3d and brush is not None:

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

@ -3179,7 +3179,7 @@ void GPENCIL_OT_color_unlock_all(wmOperatorType *ot)
/* ***************** Select all strokes using color ************************ */
static int gpencil_color_select_exec(bContext *C, wmOperator *op)
static int gpencil_select_material_exec(bContext *C, wmOperator *op)
{
bGPdata *gpd = ED_gpencil_data_get_active(C);
Object *ob = CTX_data_active_object(C);
@ -3249,15 +3249,15 @@ static int gpencil_color_select_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
void GPENCIL_OT_color_select(wmOperatorType *ot)
void GPENCIL_OT_select_material(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Select Color";
ot->idname = "GPENCIL_OT_color_select";
ot->description = "Select all Grease Pencil strokes using current color";
ot->name = "Select Material";
ot->idname = "GPENCIL_OT_select_material";
ot->description = "Select/Deselect all Grease Pencil strokes using current material";
/* callbacks */
ot->exec = gpencil_color_select_exec;
ot->exec = gpencil_select_material_exec;
ot->poll = gpencil_active_color_poll;
/* flags */

2
source/blender/editors/gpencil/gpencil_intern.h
View File

@ -552,7 +552,7 @@ void GPENCIL_OT_color_hide(struct wmOperatorType *ot);
void GPENCIL_OT_color_reveal(struct wmOperatorType *ot);
void GPENCIL_OT_color_lock_all(struct wmOperatorType *ot);
void GPENCIL_OT_color_unlock_all(struct wmOperatorType *ot);
void GPENCIL_OT_color_select(struct wmOperatorType *ot);
void GPENCIL_OT_select_material(struct wmOperatorType *ot);
void GPENCIL_OT_set_active_material(struct wmOperatorType *ot);
/* convert old 2.7 files to 2.8 */

2
source/blender/editors/gpencil/gpencil_ops.c
View File

@ -653,7 +653,7 @@ void ED_operatortypes_gpencil(void)
WM_operatortype_append(GPENCIL_OT_color_reveal);
WM_operatortype_append(GPENCIL_OT_color_lock_all);
WM_operatortype_append(GPENCIL_OT_color_unlock_all);
WM_operatortype_append(GPENCIL_OT_color_select);
WM_operatortype_append(GPENCIL_OT_select_material);
/* Editing (Time) --------------- */