[Bf-blender-cvs] [466171d0ef4] master: GPencil: Rename operator select_color to select_vertex_color

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


Commit: 466171d0ef46225bbf61195b5a6e5eff650bf015
Author: Antonio Vazquez
Date:   Sat Mar 14 10:33:33 2020 +0100
Branches: master
https://developer.blender.org/rB466171d0ef46225bbf61195b5a6e5eff650bf015

GPencil: Rename operator select_color to select_vertex_color

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

M	source/blender/editors/gpencil/gpencil_intern.h
M	source/blender/editors/gpencil/gpencil_ops.c
M	source/blender/editors/gpencil/gpencil_select.c

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

diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 1a2ab8b47fb..a12fd81e032 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -407,7 +407,7 @@ void GPENCIL_OT_select_less(struct wmOperatorType *ot);
 void GPENCIL_OT_select_first(struct wmOperatorType *ot);
 void GPENCIL_OT_select_last(struct wmOperatorType *ot);
 void GPENCIL_OT_select_alternate(struct wmOperatorType *ot);
-void GPENCIL_OT_select_color(struct wmOperatorType *ot);
+void GPENCIL_OT_select_vertex_color(struct wmOperatorType *ot);
 
 void GPENCIL_OT_duplicate(struct wmOperatorType *ot);
 void GPENCIL_OT_delete(struct wmOperatorType *ot);
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 3170623e574..233bebfc9b6 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -544,7 +544,7 @@ void ED_operatortypes_gpencil(void)
   WM_operatortype_append(GPENCIL_OT_select_first);
   WM_operatortype_append(GPENCIL_OT_select_last);
   WM_operatortype_append(GPENCIL_OT_select_alternate);
-  WM_operatortype_append(GPENCIL_OT_select_color);
+  WM_operatortype_append(GPENCIL_OT_select_vertex_color);
 
   WM_operatortype_append(GPENCIL_OT_duplicate);
   WM_operatortype_append(GPENCIL_OT_delete);
diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
index 26b68707d55..175b7b8c196 100644
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -1655,7 +1655,7 @@ void GPENCIL_OT_select(wmOperatorType *ot)
 }
 
 /* Select by Vertex Color. */
-static bool gpencil_select_color_poll(bContext *C)
+static bool gpencil_select_vertex_color_poll(bContext *C)
 {
   ToolSettings *ts = CTX_data_tool_settings(C);
   Object *ob = CTX_data_active_object(C);
@@ -1678,7 +1678,7 @@ static bool gpencil_select_color_poll(bContext *C)
   return false;
 }
 
-static int gpencil_select_color_exec(bContext *C, wmOperator *op)
+static int gpencil_select_vertex_color_exec(bContext *C, wmOperator *op)
 {
   const float threshold = RNA_float_get(op->ptr, "threshold");
 
@@ -1736,18 +1736,18 @@ static int gpencil_select_color_exec(bContext *C, wmOperator *op)
   return OPERATOR_FINISHED;
 }
 
-void GPENCIL_OT_select_color(wmOperatorType *ot)
+void GPENCIL_OT_select_vertex_color(wmOperatorType *ot)
 {
   PropertyRNA *prop;
 
   /* identifiers */
-  ot->name = "Select Color";
-  ot->idname = "GPENCIL_OT_select_color";
-  ot->description = "Select all strokes with same color";
+  ot->name = "Select Vertex Color";
+  ot->idname = "GPENCIL_OT_select_vertex_color";
+  ot->description = "Select all strokes with same vertex color";
 
   /* callbacks */
-  ot->exec = gpencil_select_color_exec;
-  ot->poll = gpencil_select_color_poll;
+  ot->exec = gpencil_select_vertex_color_exec;
+  ot->poll = gpencil_select_vertex_color_poll;
 
   /* flags */
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;



More information about the Bf-blender-cvs mailing list