[Bf-blender-cvs] [e9dd6883470] greasepencil-object: GPencil: Set Reset UV menu as one option only

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


Commit: e9dd6883470c71995047e30d9375c7db0d208f06
Author: Antonio Vazquez
Date:   Wed Oct 2 15:40:28 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe9dd6883470c71995047e30d9375c7db0d208f06

GPencil: Set Reset UV menu as one option only

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

M	release/scripts/startup/bl_ui/space_view3d.py
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 c6681df96ac..04483dc1483 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4598,7 +4598,7 @@ class VIEW3D_MT_edit_gpencil_stroke(Menu):
         layout.operator("gpencil.stroke_flip", text="Switch Direction")
 
         layout.separator()
-        layout.operator_menu_enum("gpencil.reset_uv_transform", "mode", text="Reset UV Transform")
+        layout.operator("gpencil.reset_uv_transform", text="Reset UV Transform")
 
 
 class VIEW3D_MT_edit_gpencil_point(Menu):
diff --git a/source/blender/editors/gpencil/gpencil_uv.c b/source/blender/editors/gpencil/gpencil_uv.c
index 570a3d4f258..4e5df2a4de1 100644
--- a/source/blender/editors/gpencil/gpencil_uv.c
+++ b/source/blender/editors/gpencil/gpencil_uv.c
@@ -499,7 +499,7 @@ void GPENCIL_OT_transform_uv(wmOperatorType *ot)
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_GRAB_CURSOR_XY | OPTYPE_BLOCKING;
 
   /* properties */
-  ot->prop = RNA_def_enum(ot->srna, "mode", uv_mode, 0, "Mode", "");
+  ot->prop = RNA_def_enum(ot->srna, "mode", uv_mode, GP_UV_ROTATE, "Mode", "");
 
   prop = RNA_def_float_vector(
       ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "", -FLT_MAX, FLT_MAX);
@@ -585,5 +585,5 @@ void GPENCIL_OT_reset_uv_transform(wmOperatorType *ot)
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
   /* properties */
-  ot->prop = RNA_def_enum(ot->srna, "mode", uv_clear_mode, 0, "Mode", "");
+  ot->prop = RNA_def_enum(ot->srna, "mode", uv_clear_mode, GP_UV_ALL, "Mode", "");
 }



More information about the Bf-blender-cvs mailing list