[Bf-blender-cvs] [ba9ac200cef] greasepencil-object: GPencil: Rename Clear transform to Reset

Antonio Vazquez noreply at git.blender.org
Wed Oct 2 15:43:26 CEST 2019


Commit: ba9ac200cefb5d69a7528acffc24157a1ffdc9a0
Author: Antonio Vazquez
Date:   Wed Oct 2 15:26:20 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBba9ac200cefb5d69a7528acffc24157a1ffdc9a0

GPencil: Rename Clear transform to Reset

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 5a7935c4aa5..c6681df96ac 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4585,7 +4585,6 @@ class VIEW3D_MT_edit_gpencil_stroke(Menu):
         layout.menu("GPENCIL_MT_move_to_layer")
         layout.menu("VIEW3D_MT_assign_material")
         layout.operator("gpencil.set_active_material", text="Set as Active Material")
-        layout.operator_menu_enum("gpencil.clear_uv_transform", "mode", text="Clear UV Transform")
         layout.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange Strokes")
 
         layout.separator()
@@ -4598,6 +4597,9 @@ class VIEW3D_MT_edit_gpencil_stroke(Menu):
         layout.operator_menu_enum("gpencil.stroke_caps_set", text="Toggle Caps", property="type")
         layout.operator("gpencil.stroke_flip", text="Switch Direction")
 
+        layout.separator()
+        layout.operator_menu_enum("gpencil.reset_uv_transform", "mode", text="Reset UV Transform")
+
 
 class VIEW3D_MT_edit_gpencil_point(Menu):
     bl_label = "Point"
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 9ecb58f0f65..bd79bdfe681 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -493,7 +493,7 @@ void GPENCIL_OT_stroke_trim(struct wmOperatorType *ot);
 void GPENCIL_OT_stroke_merge_by_distance(struct wmOperatorType *ot);
 
 void GPENCIL_OT_transform_uv(struct wmOperatorType *ot);
-void GPENCIL_OT_clear_uv_transform(struct wmOperatorType *ot);
+void GPENCIL_OT_reset_uv_transform(struct wmOperatorType *ot);
 
 void GPENCIL_OT_brush_presets_create(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 7f7bbb9fb3b..ff68907427d 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -323,7 +323,7 @@ void ED_operatortypes_gpencil(void)
   WM_operatortype_append(GPENCIL_OT_stroke_merge_by_distance);
 
   WM_operatortype_append(GPENCIL_OT_transform_uv);
-  WM_operatortype_append(GPENCIL_OT_clear_uv_transform);
+  WM_operatortype_append(GPENCIL_OT_reset_uv_transform);
 
   WM_operatortype_append(GPENCIL_OT_brush_presets_create);
 
diff --git a/source/blender/editors/gpencil/gpencil_uv.c b/source/blender/editors/gpencil/gpencil_uv.c
index 90bae1f917f..570a3d4f258 100644
--- a/source/blender/editors/gpencil/gpencil_uv.c
+++ b/source/blender/editors/gpencil/gpencil_uv.c
@@ -527,7 +527,7 @@ void GPENCIL_OT_transform_uv(wmOperatorType *ot)
 }
 
 /* Clear UV transformations. */
-static int gpencil_clear_uv_transform_exec(bContext *C, wmOperator *op)
+static int gpencil_reset_uv_transform_exec(bContext *C, wmOperator *op)
 {
   const int mode = RNA_enum_get(op->ptr, "mode");
   Object *ob = CTX_data_active_object(C);
@@ -562,7 +562,7 @@ static int gpencil_clear_uv_transform_exec(bContext *C, wmOperator *op)
   return OPERATOR_FINISHED;
 }
 
-void GPENCIL_OT_clear_uv_transform(wmOperatorType *ot)
+void GPENCIL_OT_reset_uv_transform(wmOperatorType *ot)
 {
   static const EnumPropertyItem uv_clear_mode[] = {
       {GP_UV_ALL, "ALL", 0, "All", ""},
@@ -573,12 +573,12 @@ void GPENCIL_OT_clear_uv_transform(wmOperatorType *ot)
   };
 
   /* identifiers */
-  ot->name = "Clear UV Transformations";
-  ot->idname = "GPENCIL_OT_clear_uv_transform";
+  ot->name = "Reset UV Transformations";
+  ot->idname = "GPENCIL_OT_reset_uv_transform";
   ot->description = "Reset any UV transformation and back to default values";
 
   /* callbacks */
-  ot->exec = gpencil_clear_uv_transform_exec;
+  ot->exec = gpencil_reset_uv_transform_exec;
   ot->poll = gpencil_uv_transform_poll;
 
   /* flags */



More information about the Bf-blender-cvs mailing list