[Bf-blender-cvs] [d50d410a706] master: GPencil: Rename operator color_select to select_material

Antonio Vazquez noreply at git.blender.org
Sat Mar 14 11:07:43 CET 2020


Commit: d50d410a7066549c69523ba3e0748e437de49949
Author: Antonio Vazquez
Date:   Sat Mar 14 10:30:59 2020 +0100
Branches: master
https://developer.blender.org/rBd50d410a7066549c69523ba3e0748e437de49949

GPencil: Rename operator color_select to select_material

The old name was related to the old palettes.

===================================================================

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	source/blender/editors/gpencil/gpencil_data.c
M	source/blender/editors/gpencil/gpencil_intern.h
M	source/blender/editors/gpencil/gpencil_ops.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 7c79349a245..95997b48680 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -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:
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 9b33e999a25..e5d332a86de 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -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 */
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 2d36e426835..1a2ab8b47fb 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -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 */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 275075c38db..3170623e574 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -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) --------------- */



More information about the Bf-blender-cvs mailing list