Patch #6192 - Wave Modifier Option to move verts along normals

This patch adds an option to the wave modifier to displace along the normals
of the base mesh, rather than in the local Z direction.

Thanks to Michael Fox (mfoxdoggg) for the patch!

2 files changed, 9 insertions, 5 deletions

diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h
index 435a18e5ab2..4d910861acd 100644
--- a/source/blender/makesdna/DNA_effect_types.h
+++ b/source/blender/makesdna/DNA_effect_types.h
@@ -77,11 +77,6 @@
 #define PAF_TEXRGB		1
 #define PAF_TEXGRAD		2
 
-	/* wav->flag */
-#define WAV_X			2
-#define WAV_Y			4
-#define WAV_CYCL		8
-
 typedef struct Effect {
 	struct Effect *next, *prev;
 	short type, flag, buttype, rt;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a7b68b09f1a..99f3a65bf43 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -278,6 +278,15 @@ enum {
 	MOD_WAV_MAP_UV,
 };
 
+/* WaveModifierData.flag */
+#define MOD_WAVE_X      1<<1
+#define MOD_WAVE_Y      1<<2
+#define MOD_WAVE_CYCL   1<<3
+#define MOD_WAVE_NORM   1<<4
+#define MOD_WAVE_NORM_X 1<<5
+#define MOD_WAVE_NORM_Y 1<<6
+#define MOD_WAVE_NORM_Z 1<<7
+
 typedef struct WaveModifierData {
 	ModifierData modifier;