blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: use common 'MOD_WELD_MODE_' prefix

This commit is contained in:
Campbell Barton 2020-12-09 14:10:30 +11:00
parent 9b11a7776f
commit 5cdfceaa1a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesdna/DNA_modifier_defaults.h
View File

@ -801,7 +801,7 @@
#define _DNA_DEFAULT_WeldModifierData \
{ \
.merge_dist = 0.001f, \
.mode = MOD_WELD_ALL_MODE, \
.mode = MOD_WELD_MODE_ALL, \
.defgrp_name = "", \
}

4
source/blender/makesdna/DNA_modifier_types.h
View File

@ -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 {

4
source/blender/makesrna/intern/rna_modifier.c
View File

@ -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},
};

6
source/blender/modifiers/intern/MOD_weld.c
View File

@ -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;