From 5cdfceaa1a7efb71d528a04a01cb74181f1aa8e4 Mon Sep 17 00:00:00 2001 From: Campbell Barton 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 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/makesdna') 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 { -- cgit v1.2.3