svn merge ^/trunk/blender -r43009:43033

1 files changed, 36 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 093ab2f6dc1..dd68694404d 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -76,6 +76,7 @@ typedef enum ModifierType {
 	eModifierType_WeightVGProximity,
 	eModifierType_Ocean,
 	eModifierType_DynamicPaint,
+	eModifierType_Remesh,
 
 	/* BMESH ONLY - keeps getting bumped by new modifiers in trunk */
 	eModifierType_NgonInterp,
@@ -1041,4 +1042,39 @@ typedef struct DynamicPaintModifierData {
 	int pad;
 } DynamicPaintModifierData;
 
+/* Remesh modifier */
+
+typedef enum RemeshModifierFlags {
+	MOD_REMESH_FLOOD_FILL = 1,
+} RemeshModifierFlags;
+
+typedef enum RemeshModifierMode {
+	/* blocky */
+	MOD_REMESH_CENTROID = 0,
+	/* smooth */
+	MOD_REMESH_MASS_POINT = 1,
+	/* keeps sharp edges */
+	MOD_REMESH_SHARP_FEATURES = 2,
+} RemeshModifierMode;
+
+typedef struct RemeshModifierData {
+	ModifierData modifier;
+
+	/* floodfill option, controls how small components can be
+	   before they are removed */
+	float threshold;
+
+	/* ratio between size of model and grid */
+	float scale;
+
+	float hermite_num;
+
+	/* octree depth */
+	char depth;
+
+	char flag;
+	char mode;
+	char pad;
+} RemeshModifierData;
+
 #endif