3 files changed, 20 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h
index dc3118b7f73..299756edfe1 100644
--- a/source/blender/makesdna/DNA_effect_types.h
+++ b/source/blender/makesdna/DNA_effect_types.h
@@ -51,7 +51,6 @@
 
 	/* eff->flag */
 #define EFF_SELECT		1
-#define EFF_CYCLIC		2
 
 	/* paf->stype */
 #define PAF_NORMAL		0
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 1b183c3cb39..f6f16b94f3a 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -80,9 +80,6 @@ typedef struct Mesh {
 	struct MSticky *msticky;
 	struct Mesh *texcomesh;
 
-		/* hacky place to store temporary decimated mesh */
-	struct DispListMesh *decimated;
-
 	struct OcInfo *oc;		/* not written in file */
 	void *sumohandle;
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index c4c5227fa73..66732fe0dc4 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -12,6 +12,8 @@ typedef enum ModifierType {
 	eModifierType_Curve,
 	eModifierType_Build,
 	eModifierType_Mirror,
+	eModifierType_Decimate,
+	eModifierType_Wave,
 
 	NUM_MODIFIER_TYPES
 } ModifierType;
@@ -71,4 +73,22 @@ typedef struct MirrorModifierData {
 	float tolerance;
 } MirrorModifierData;
 
+typedef struct DecimateModifierData {
+	ModifierData modifier;
+
+	float percent;
+	int faceCount;
+} DecimateModifierData;
+
+typedef struct WaveModifierData {
+	ModifierData modifier;
+
+	short flag, pad;
+
+	float startx, starty, height, width;
+	float narrow, speed, damp;
+	
+	float timeoffs, lifetime;
+} WaveModifierData;
+
 #endif