Dynamic Paint:

Committed changes from previous weeks, biggest changes are:
* Canvas can now have multiple "surfaces" that each can have specific format, type and settings.
* Renewed UI to support this new system.
* Aside from old "image sequence" output format, Dynamic Paint can now work on vertex level as well. Currently vertex paint and displace are supported.
* Integrated vertex level painting with Point Cache.
* Added viewport preview for Point Cache surfaces.

Due to massive amount of changes, old Dynamic Paint saves are no longer supported. Also some features are temporarily missing or may not work properly.

1 files changed, 3 insertions, 7 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index f7d30a45e6b..45a95afc3a1 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -789,18 +789,14 @@ typedef enum {
 } WarpModifierFalloff;
 /* Dynamic paint modifier flags */
 #define MOD_DYNAMICPAINT_TYPE_CANVAS (1 << 0)
-#define MOD_DYNAMICPAINT_TYPE_PAINT (1 << 1)
+#define MOD_DYNAMICPAINT_TYPE_BRUSH (1 << 1)
 
 typedef struct DynamicPaintModifierData {
 	ModifierData modifier;
 
 	struct DynamicPaintCanvasSettings *canvas;
-	struct DynamicPaintPainterSettings *paint;
-	float time;
+	struct DynamicPaintBrushSettings *brush;
 	int type;  /* canvas / painter */
-	short baking;	/* Set nonzero if baking,
-					*  -> updates derived mesh on modifier call*/
-	short pad;
-	int pad2;
+	int pad;
 } DynamicPaintModifierData;
 #endif