From 5cdfceaa1a7efb71d528a04a01cb74181f1aa8e4 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 9 Dec 2020 14:10:30 +1100
Subject: Cleanup: use common 'MOD_WELD_MODE_' prefix

---
 source/blender/makesdna/DNA_modifier_defaults.h | 2 +-
 source/blender/makesdna/DNA_modifier_types.h    | 4 ++--
 source/blender/makesrna/intern/rna_modifier.c   | 4 ++--
 source/blender/modifiers/intern/MOD_weld.c      | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source')

diff --git a/source/blender/makesdna/DNA_modifier_defaults.h b/source/blender/makesdna/DNA_modifier_defaults.h
index 793a229bdc5..e122d50cba8 100644
--- a/source/blender/makesdna/DNA_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_modifier_defaults.h
@@ -801,7 +801,7 @@
 #define _DNA_DEFAULT_WeldModifierData \
   { \
     .merge_dist = 0.001f, \
-    .mode = MOD_WELD_ALL_MODE, \
+    .mode = MOD_WELD_MODE_ALL, \
     .defgrp_name = "", \
   }
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index d99564ff33e..03cf4aca963 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -2016,8 +2016,8 @@ enum {
 
 /* #WeldModifierData.mode */
 enum {
-  MOD_WELD_ALL_MODE = 0,
-  MOD_WELD_CONNECTED_MODE = 1,
+  MOD_WELD_MODE_ALL = 0,
+  MOD_WELD_MODE_CONNECTED = 1,
 };
 
 typedef struct DataTransferModifierData {
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 4ce859ddce9..99304d29e00 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -6232,8 +6232,8 @@ static void rna_def_modifier_weld(BlenderRNA *brna)
   PropertyRNA *prop;
 
   static const EnumPropertyItem mode_items[] = {
-      {MOD_WELD_ALL_MODE, "ALL", 0, "All", "Full merge by distance"},
-      {MOD_WELD_CONNECTED_MODE, "CONNECTED", 0, "Connected", "Only merge along the edges"},
+      {MOD_WELD_MODE_ALL, "ALL", 0, "All", "Full merge by distance"},
+      {MOD_WELD_MODE_CONNECTED, "CONNECTED", 0, "Connected", "Only merge along the edges"},
       {0, NULL, 0, NULL, NULL},
   };
 
diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c
index a50323a24ee..e34dcf48c19 100644
--- a/source/blender/modifiers/intern/MOD_weld.c
+++ b/source/blender/modifiers/intern/MOD_weld.c
@@ -1567,7 +1567,7 @@ static bool bvhtree_weld_overlap_cb(void *userdata, int index_a, int index_b, in
 }
 #endif
 
-/** Use for #MOD_WELD_CONNECTED_MODE calculation. */
+/** Use for #MOD_WELD_MODE_CONNECTED calculation. */
 struct WeldVertexCluster {
   float co[3];
   uint merged_verts;
@@ -1612,7 +1612,7 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
    * This indicates which vert it is or is going to be merged. */
   uint *vert_dest_map = MEM_malloc_arrayN(totvert, sizeof(*vert_dest_map), __func__);
   uint vert_kill_len = 0;
-  if (wmd->mode == MOD_WELD_ALL_MODE)
+  if (wmd->mode == MOD_WELD_MODE_ALL)
 #ifdef USE_BVHTREEKDOP
   {
     /* Get overlap map. */
@@ -1709,7 +1709,7 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
   }
 #endif
   else {
-    BLI_assert(wmd->mode == MOD_WELD_CONNECTED_MODE);
+    BLI_assert(wmd->mode == MOD_WELD_MODE_CONNECTED);
 
     MEdge *medge, *me;
 
-- 
cgit v1.2.3