[Bf-blender-cvs] [3d28d648e45] greasepencil-object: GPencil: Put Vertex Paint mode before Weight Paint mode

Antonio Vazquez noreply at git.blender.org
Thu Nov 7 19:58:43 CET 2019


Commit: 3d28d648e45f4c7af3c82413d8f3983eabd3e86b
Author: Antonio Vazquez
Date:   Thu Nov 7 19:56:22 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB3d28d648e45f4c7af3c82413d8f3983eabd3e86b

GPencil: Put Vertex Paint mode before Weight Paint mode

This is to keep UI consistency.

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

M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 51a4fc17972..186ccd20f33 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -84,16 +84,16 @@ const EnumPropertyItem rna_enum_object_mode_items[] = {
      ICON_GREASEPENCIL,
      "Draw",
      "Paint Grease Pencil Strokes"},
-    {OB_MODE_WEIGHT_GPENCIL,
-     "WEIGHT_GPENCIL",
-     ICON_WPAINT_HLT,
-     "Weight Paint",
-     "Grease Pencil Weight Paint Strokes"},
     {OB_MODE_VERTEX_GPENCIL,
      "VERTEX_GPENCIL",
      ICON_VPAINT_HLT,
      "Vertex Paint",
      "Grease Pencil Vertex Paint Strokes"},
+    {OB_MODE_WEIGHT_GPENCIL,
+     "WEIGHT_GPENCIL",
+     ICON_WPAINT_HLT,
+     "Weight Paint",
+     "Grease Pencil Weight Paint Strokes"},
     {0, NULL, 0, NULL, NULL},
 };
 
@@ -122,16 +122,16 @@ const EnumPropertyItem rna_enum_workspace_object_mode_items[] = {
      ICON_GREASEPENCIL,
      "Grease Pencil Draw",
      "Paint Grease Pencil Strokes"},
-    {OB_MODE_WEIGHT_GPENCIL,
-     "WEIGHT_GPENCIL",
-     ICON_WPAINT_HLT,
-     "Grease Pencil Weight Paint",
-     "Grease Pencil Weight Paint Strokes"},
     {OB_MODE_VERTEX_GPENCIL,
      "VERTEX_GPENCIL",
      ICON_VPAINT_HLT,
      "Grease Pencil Vertex Paint",
      "Grease Pencil Vertex Paint Strokes"},
+    {OB_MODE_WEIGHT_GPENCIL,
+     "WEIGHT_GPENCIL",
+     ICON_WPAINT_HLT,
+     "Grease Pencil Weight Paint",
+     "Grease Pencil Weight Paint Strokes"},
     {0, NULL, 0, NULL, NULL},
 };



More information about the Bf-blender-cvs mailing list