[Bf-blender-cvs] [88762806bbd] temp-gpencil-camera-reproject: GPencil: Fix wrong enum list after merge

Antonio Vazquez noreply at git.blender.org
Mon Jun 21 20:00:54 CEST 2021


Commit: 88762806bbd0b0805655c1d0271b4143e7e6d835
Author: Antonio Vazquez
Date:   Mon Jun 21 20:00:43 2021 +0200
Branches: temp-gpencil-camera-reproject
https://developer.blender.org/rB88762806bbd0b0805655c1d0271b4143e7e6d835

GPencil: Fix wrong enum list after merge

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

M	source/blender/editors/gpencil/gpencil_edit.c

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 21fa3ad3967..a10e875ff23 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -3845,29 +3845,6 @@ static int gpencil_strokes_reproject_exec(bContext *C, wmOperator *op)
 
 void GPENCIL_OT_reproject(wmOperatorType *ot)
 {
-  static const EnumPropertyItem reproject_type[] = {
-      {GP_REPROJECT_FRONT, "FRONT", 0, "Front", "Reproject the strokes using the X-Z plane"},
-      {GP_REPROJECT_SIDE, "SIDE", 0, "Side", "Reproject the strokes using the Y-Z plane"},
-      {GP_REPROJECT_TOP, "TOP", 0, "Top", "Reproject the strokes using the X-Y plane"},
-      {GP_REPROJECT_VIEW,
-       "VIEW",
-       0,
-       "View",
-       "Reproject the strokes to end up on the same plane, as if drawn from the current "
-       "viewpoint "
-       "using 'Cursor' Stroke Placement"},
-      {GP_REPROJECT_SURFACE,
-       "SURFACE",
-       0,
-       "Surface",
-       "Reproject the strokes on to the scene geometry, as if drawn using 'Surface' placement"},
-      {GP_REPROJECT_CURSOR,
-       "CURSOR",
-       0,
-       "Cursor",
-       "Reproject the strokes using the orientation of 3D cursor"},
-      {0, NULL, 0, NULL, NULL},
-  };
 
   /* identifiers */
   ot->name = "Reproject Strokes";
@@ -3887,8 +3864,12 @@ void GPENCIL_OT_reproject(wmOperatorType *ot)
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
   /* properties */
-  ot->prop = RNA_def_enum(
-      ot->srna, "type", reproject_type, GP_REPROJECT_VIEW, "Projection Type", "");
+  ot->prop = RNA_def_enum(ot->srna,
+                          "type",
+                          rna_gpencil_reproject_type_items,
+                          GP_REPROJECT_VIEW,
+                          "Projection Type",
+                          "");
 
   RNA_def_boolean(
       ot->srna,



More information about the Bf-blender-cvs mailing list