9 files changed, 853 insertions, 0 deletions

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 882fbce9271..e617ec5c45a 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -194,6 +194,10 @@ extern StructRNA RNA_Driver;
 extern StructRNA RNA_DriverTarget;
 extern StructRNA RNA_DriverVariable;
 extern StructRNA RNA_DupliObject;
+extern StructRNA RNA_DynamicPaintBrushSettings;
+extern StructRNA RNA_DynamicPaintCanvasSettings;
+extern StructRNA RNA_DynamicPaintModifier;
+extern StructRNA RNA_DynamicPaintSurface;
 extern StructRNA RNA_EdgeSplitModifier;
 extern StructRNA RNA_EditBone;
 extern StructRNA RNA_EffectSequence;
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index fc415dc8082..e4ad58d5f03 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -110,6 +110,8 @@ extern EnumPropertyItem node_filter_items[];
 
 extern EnumPropertyItem ramp_blend_items[];
 
+extern EnumPropertyItem prop_dynamicpaint_type_items[];
+
 struct bContext;
 struct PointerRNA;
 struct PropertyRNA;
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 1db29855c18..b4a6ca71f2d 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -47,6 +47,7 @@ set(DEFSRC
 	rna_context.c
 	rna_controller.c
 	rna_curve.c
+	rna_dynamicpaint.c
 	rna_fcurve.c
 	rna_fluidsim.c
 	rna_gpencil.c
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 7da538e171b..3af4e8308d6 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -2432,6 +2432,7 @@ static RNAProcessItem PROCESS_ITEMS[]= {
 	{"rna_context.c", NULL, RNA_def_context},
 	{"rna_controller.c", "rna_controller_api.c", RNA_def_controller},
 	{"rna_curve.c", NULL, RNA_def_curve},
+	{"rna_dynamicpaint.c", NULL, RNA_def_dynamic_paint},
 	{"rna_fcurve.c", "rna_fcurve_api.c", RNA_def_fcurve},
 	{"rna_fluidsim.c", NULL, RNA_def_fluidsim},
 	{"rna_gpencil.c", NULL, RNA_def_gpencil},
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c
new file mode 100644
index 00000000000..90275db503c
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_dynamicpaint.c
@@ -0,0 +1,792 @@
+/**
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Contributor(s): Miika Hämäläinen
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <limits.h>
+
+#include "RNA_define.h"
+
+#include "rna_internal.h"
+
+#include "BKE_modifier.h"
+#include "BKE_dynamicpaint.h"
+
+#include "DNA_dynamicpaint_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_object_force.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#include "WM_types.h"
+
+EnumPropertyItem prop_dynamicpaint_type_items[] = {
+		{MOD_DYNAMICPAINT_TYPE_CANVAS, "CANVAS", 0, "Canvas", ""},
+		{MOD_DYNAMICPAINT_TYPE_BRUSH, "BRUSH", 0, "Brush", ""},
+		{0, NULL, 0, NULL, NULL}};
+
+
+#ifdef RNA_RUNTIME
+
+#include "BKE_context.h"
+#include "BKE_depsgraph.h"
+#include "BKE_particle.h"
+
+
+static char *rna_DynamicPaintCanvasSettings_path(PointerRNA *ptr)
+{
+	DynamicPaintCanvasSettings *settings = (DynamicPaintCanvasSettings*)ptr->data;
+	ModifierData *md= (ModifierData *)settings->pmd;
+
+	return BLI_sprintfN("modifiers[\"%s\"].canvas_settings", md->name);
+}
+
+static char *rna_DynamicPaintBrushSettings_path(PointerRNA *ptr)
+{
+	DynamicPaintBrushSettings *settings = (DynamicPaintBrushSettings*)ptr->data;
+	ModifierData *md= (ModifierData *)settings->pmd;
+
+	return BLI_sprintfN("modifiers[\"%s\"].brush_settings", md->name);
+}
+
+static char *rna_DynamicPaintSurface_path(PointerRNA *ptr)
+{
+	DynamicPaintSurface *surface = (DynamicPaintSurface*)ptr->data;
+	ModifierData *md= (ModifierData *)surface->canvas->pmd;
+
+	return BLI_sprintfN("modifiers[\"%s\"].canvas_settings.canvas_surfaces[\"%s\"]", md->name, surface->name);
+}
+
+
+/*
+*	Surfaces
+*/
+
+static void rna_DynamicPaint_redoModifier(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	DAG_id_tag_update(ptr->id.data, OB_RECALC_DATA);
+}
+
+static void rna_DynamicPaintSurfaces_updateFrames(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	dynamicPaint_cacheUpdateFrames((DynamicPaintSurface*)ptr->data);
+}
+
+static void rna_DynamicPaintSurface_reset(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	dynamicPaint_resetSurface((DynamicPaintSurface*)ptr->data);
+	rna_DynamicPaint_redoModifier(bmain, scene, ptr);
+}
+
+static void rna_DynamicPaintSurface_changePreview(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	DynamicPaintSurface *act_surface = (DynamicPaintSurface*)ptr->data;
+	DynamicPaintSurface *surface = act_surface->canvas->surfaces.first;
+
+	/* since only one color surface can show preview at time
+	*  disable preview on other surfaces*/
+	for(; surface; surface=surface->next) {
+		if(surface != act_surface)
+			surface->flags &= ~MOD_DPAINT_PREVIEW;
+	}
+	rna_DynamicPaint_redoModifier(bmain, scene, ptr);
+}
+
+static void rna_DynamicPaintSurface_uniqueName(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	dynamicPaintSurface_setUniqueName((DynamicPaintSurface*)ptr->data, ((DynamicPaintSurface*)ptr->data)->name);
+}
+
+
+static void rna_DynamicPaintSurface_changeType(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	dynamicPaintSurface_updateType((DynamicPaintSurface*)ptr->data);
+	dynamicPaint_resetSurface((DynamicPaintSurface*)ptr->data);
+	rna_DynamicPaintSurface_reset(bmain, scene, ptr);
+}
+
+static void rna_DynamicPaintSurfaces_changeFormat(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	DynamicPaintSurface *surface = (DynamicPaintSurface*)ptr->data;
+
+	surface->type = MOD_DPAINT_SURFACE_T_PAINT;
+	dynamicPaintSurface_updateType((DynamicPaintSurface*)ptr->data);
+	rna_DynamicPaintSurface_reset(bmain, scene, ptr);
+}
+
+static void rna_DynamicPaint_resetDependancy(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	rna_DynamicPaintSurface_reset(bmain, scene, ptr);
+	DAG_scene_sort(bmain, scene);
+}
+
+static PointerRNA rna_PaintSurface_active_get(PointerRNA *ptr)
+{
+	DynamicPaintCanvasSettings *canvas= (DynamicPaintCanvasSettings*)ptr->data;
+	DynamicPaintSurface *surface = canvas->surfaces.first;
+	int id=0;
+
+	for(; surface; surface=surface->next) {
+		if(id == canvas->active_sur)
+			return rna_pointer_inherit_refine(ptr, &RNA_DynamicPaintSurface, surface);
+		id++;
+	}
+	return rna_pointer_inherit_refine(ptr, &RNA_DynamicPaintSurface, NULL);
+}
+
+static void rna_DynamicPaint_surfaces_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+{
+	DynamicPaintCanvasSettings *canvas= (DynamicPaintCanvasSettings*)ptr->data;
+	//rna_iterator_array_begin(iter, (void*)canvas->surfaces, sizeof(PaintSurface), canvas->totsur, 0, 0);
+	rna_iterator_listbase_begin(iter, &canvas->surfaces, NULL);
+}
+
+static int rna_Surface_active_point_index_get(PointerRNA *ptr)
+{
+	DynamicPaintCanvasSettings *canvas= (DynamicPaintCanvasSettings*)ptr->data;
+	return canvas->active_sur;
+}
+
+static void rna_Surface_active_point_index_set(struct PointerRNA *ptr, int value)
+{
+	DynamicPaintCanvasSettings *canvas= (DynamicPaintCanvasSettings*)ptr->data;
+	canvas->active_sur = value;
+	return;
+}
+
+static void rna_Surface_active_point_range(PointerRNA *ptr, int *min, int *max)
+{
+	DynamicPaintCanvasSettings *canvas= (DynamicPaintCanvasSettings*)ptr->data;
+
+	*min= 0;
+	*max= BLI_countlist(&canvas->surfaces)-1;
+}
+
+/* uvlayer */
+static void rna_DynamicPaint_uvlayer_set(PointerRNA *ptr, const char *value)
+{
+	DynamicPaintCanvasSettings *canvas= ((DynamicPaintSurface*)ptr->data)->canvas;
+	DynamicPaintSurface *surface = canvas->surfaces.first;
+	int id=0;
+
+	for(; surface; surface=surface->next) {
+		if(id == canvas->active_sur) {
+			rna_object_uvlayer_name_set(ptr, value, surface->uvlayer_name, sizeof(surface->uvlayer_name));
+			return;
+		}
+		id++;
+	}
+}
+
+/* is point cache used */
+static int rna_DynamicPaint_uses_cache_get(PointerRNA *ptr)
+{
+	DynamicPaintSurface *surface= (DynamicPaintSurface*)ptr->data;
+
+	return (surface->format != MOD_DPAINT_SURFACE_F_IMAGESEQ) ?  1 : 0;
+}
+
+static void rna_DynamicPaint_uses_cache_set(PointerRNA *ptr, int value)
+{
+}
+
+
+static EnumPropertyItem *rna_DynamicPaint_surface_type_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free)
+{
+	DynamicPaintSurface *surface= (DynamicPaintSurface*)ptr->data;
+
+	EnumPropertyItem *item= NULL;
+	EnumPropertyItem tmp= {0, "", 0, "", ""};
+	int totitem= 0;
+
+	/* Paint type - available for all formats */
+	tmp.value = MOD_DPAINT_SURFACE_T_PAINT;
+	tmp.identifier = "PAINT";
+	tmp.name = "Paint";
+	RNA_enum_item_add(&item, &totitem, &tmp);
+
+	/* Displace */
+	if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX ||
+		surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) {
+		tmp.value = MOD_DPAINT_SURFACE_T_DISPLACE;
+		tmp.identifier = "DISPLACE";
+		tmp.name = "Displace";
+		RNA_enum_item_add(&item, &totitem, &tmp);
+	}
+
+	/* Weight */
+	if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) {
+		tmp.value = MOD_DPAINT_SURFACE_T_WEIGHT;
+		tmp.identifier = "WEIGHT";
+		tmp.name = "Weight";
+		RNA_enum_item_add(&item, &totitem, &tmp);
+	}
+
+	/* Height waves */
+	{
+		tmp.value = MOD_DPAINT_SURFACE_T_WAVE;
+		tmp.identifier = "WAVE";
+		tmp.name = "Waves";
+		RNA_enum_item_add(&item, &totitem, &tmp);
+	}
+
+	RNA_enum_item_end(&item, &totitem);
+	*free = 1;
+
+	return item;
+}
+
+#else
+
+/* canvas.canvas_surfaces */
+static void rna_def_canvas_surfaces(BlenderRNA *brna, PropertyRNA *cprop)
+{
+	StructRNA *srna;
+	
+	PropertyRNA *prop;
+
+	// FunctionRNA *func;
+	// PropertyRNA *parm;
+
+	RNA_def_property_srna(cprop, "DynamicPaintSurfaces");
+	srna= RNA_def_struct(brna, "DynamicPaintSurfaces", NULL);
+	RNA_def_struct_sdna(srna, "DynamicPaintCanvasSettings");
+	RNA_def_struct_ui_text(srna, "Canvas Surfaces", "Collection of Dynamic Paint Canvas surfaces");
+
+	prop= RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_int_funcs(prop, "rna_Surface_active_point_index_get", "rna_Surface_active_point_index_set", "rna_Surface_active_point_range");
+	RNA_def_property_ui_text(prop, "Active Point Cache Index", "");
+
+	prop= RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "DynamicPaintSurface");
+	RNA_def_property_pointer_funcs(prop, "rna_PaintSurface_active_get", NULL, NULL, NULL);
+	RNA_def_property_ui_text(prop, "Active Surface", "Active Dynamic Paint surface being displayed");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
+}
+
+
+static void rna_def_canvas_surface(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/*  Surface format */
+	static EnumPropertyItem prop_dynamicpaint_surface_format[] = {
+			//{MOD_DPAINT_SURFACE_F_PTEX, "PTEX", ICON_TEXTURE_SHADED, "Ptex", ""},
+			{MOD_DPAINT_SURFACE_F_VERTEX, "VERTEX", ICON_OUTLINER_DATA_MESH, "Vertex", ""},
+			{MOD_DPAINT_SURFACE_F_IMAGESEQ, "IMAGE", ICON_FILE_IMAGE, "Image Sequence", ""},
+			{0, NULL, 0, NULL, NULL}};
+
+	/*  Surface type - generated dynamically based on surface format */
+	static EnumPropertyItem prop_dynamicpaint_surface_type[] = {
+			{MOD_DPAINT_SURFACE_T_PAINT, "PAINT", 0, "Paint", ""},
+			{0, NULL, 0, NULL, NULL}};
+
+	/*  Effect type
+	*   Only used by ui to view per effect settings */
+	static EnumPropertyItem prop_dynamicpaint_effecttype[] = {
+			{1, "SPREAD", 0, "Spread", ""},
+			{2, "DRIP", 0, "Drip", ""},
+			{3, "SHRINK", 0, "Shrink", ""},
+			{0, NULL, 0, NULL, NULL}};
+
+	/* Displacemap file format */
+	static EnumPropertyItem prop_dynamicpaint_image_fileformat[] = {
+			{MOD_DPAINT_IMGFORMAT_PNG, "PNG", 0, "PNG", ""},
+#ifdef WITH_OPENEXR
+			{MOD_DPAINT_IMGFORMAT_OPENEXR, "OPENEXR", 0, "OpenEXR", ""},
+#endif
+			{0, NULL, 0, NULL, NULL}};
+
+	/* Displacemap type */
+	static EnumPropertyItem prop_dynamicpaint_disp_type[] = {
+			{MOD_DPAINT_DISP_DISPLACE, "DISPLACE", 0, "Displacement", ""},
+			{MOD_DPAINT_DISP_DEPTH, "DEPTH", 0, "Depth", ""},
+			{0, NULL, 0, NULL, NULL}};
+
+
+
+	/* Surface */
+	srna= RNA_def_struct(brna, "DynamicPaintSurface", NULL);
+	RNA_def_struct_sdna(srna, "DynamicPaintSurface");
+	RNA_def_struct_ui_text(srna, "Paint Surface", "A canvas surface layer.");
+	RNA_def_struct_path_func(srna, "rna_DynamicPaintSurface_path");
+
+	prop= RNA_def_property(srna, "surface_format", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "format");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_surface_format);
+	RNA_def_property_ui_text(prop, "Format", "");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurfaces_changeFormat");
+
+	prop= RNA_def_property(srna, "surface_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "type");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_surface_type);
+	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_DynamicPaint_surface_type_itemf");
+	RNA_def_property_ui_text(prop, "Surface Type", "");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurface_changeType");
+
+	prop= RNA_def_property(srna, "is_active", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_ACTIVE);
+	RNA_def_property_ui_text(prop, "Is Active", "");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaint_redoModifier");
+
+	prop= RNA_def_property(srna, "show_preview", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_PREVIEW);
+	RNA_def_property_ui_text(prop, "Show Preview", "");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurface_changePreview");
+
+	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "name");
+	RNA_def_property_ui_text(prop, "Name", "Surface name");
+	RNA_def_property_update(prop, NC_OBJECT, "rna_DynamicPaintSurface_uniqueName");
+	RNA_def_struct_name_property(srna, prop);
+
+	prop= RNA_def_property(srna, "brush_group", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "brush_group");
+	RNA_def_property_struct_type(prop, "Group");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Brush Group", "Only use brush objects from this group");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaint_resetDependancy");
+
+
+	/*
+	*   Paint, wet and disp
+	*/
+
+	prop= RNA_def_property(srna, "use_dissolve", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_DISSOLVE);
+	RNA_def_property_ui_text(prop, "Dissolve", "Enable to make changes disappear over time.");
+	
+	prop= RNA_def_property(srna, "dissolve_speed", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "diss_speed");
+	RNA_def_property_range(prop, 1.0, 10000.0);
+	RNA_def_property_ui_range(prop, 1.0, 10000.0, 5, 0);
+	RNA_def_property_ui_text(prop, "Dissolve Speed", "Dissolve Speed");
+	
+	prop= RNA_def_property(srna, "dry_speed", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "dry_speed");
+	RNA_def_property_range(prop, 1.0, 10000.0);
+	RNA_def_property_ui_range(prop, 1.0, 10000.0, 5, 0);
+	RNA_def_property_ui_text(prop, "Dry Speed", "Dry Speed");
+	
+	/*
+	*   Simulation settings
+	*/
+	prop= RNA_def_property(srna, "image_resolution", PROP_INT, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_int_sdna(prop, NULL, "image_resolution");
+	RNA_def_property_range(prop, 16.0, 4096.0);
+	RNA_def_property_ui_range(prop, 16.0, 4096.0, 1, 0);
+	RNA_def_property_ui_text(prop, "Resolution", "Texture resolution");
+	
+	prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "uvlayer_name");
+	RNA_def_property_ui_text(prop, "UV Layer", "UV layer name");
+	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DynamicPaint_uvlayer_set");
+	
+	prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_int_sdna(prop, NULL, "start_frame");
+	RNA_def_property_range(prop, 1.0, 9999.0);
+	RNA_def_property_ui_range(prop, 1.0, 9999, 1, 0);
+	RNA_def_property_ui_text(prop, "Start Frame", "Simulation start frame");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurfaces_updateFrames");
+	
+	prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_int_sdna(prop, NULL, "end_frame");
+	RNA_def_property_range(prop, 1.0, 9999.0);
+	RNA_def_property_ui_range(prop, 1.0, 9999.0, 1, 0);
+	RNA_def_property_ui_text(prop, "End Frame", "Simulation end frame");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurfaces_updateFrames");
+	
+	prop= RNA_def_property(srna, "substeps", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "substeps");
+	RNA_def_property_range(prop, 0.0, 10.0);
+	RNA_def_property_ui_range(prop, 0.0, 10, 1, 0);
+	RNA_def_property_ui_text(prop, "Sub-Steps", "Do extra frames between scene frames to ensure smooth motion.");
+	
+	prop= RNA_def_property(srna, "use_anti_aliasing", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_ANTIALIAS);
+	RNA_def_property_ui_text(prop, "Anti-aliasing", "Uses 5x multisampling to smoothen paint edges.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurface_reset");
+
+	/*
+	*   Effect Settings
+	*/
+	prop= RNA_def_property(srna, "effect_ui", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "effect_ui");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_effecttype);
+	RNA_def_property_ui_text(prop, "Effect Type", "");
+	
+	prop= RNA_def_property(srna, "use_dry_log", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_DRY_LOG);
+	RNA_def_property_ui_text(prop, "Slow", "Use logarithmic drying. Makes high values to fade faster than low values.");
+
+	prop= RNA_def_property(srna, "use_dissolve_log", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_DISSOLVE_LOG);
+	RNA_def_property_ui_text(prop, "Slow", "Use logarithmic dissolve. Makes high values to fade faster than low values.");
+	
+	prop= RNA_def_property(srna, "use_spread", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_boolean_sdna(prop, NULL, "effect", MOD_DPAINT_EFFECT_DO_SPREAD);
+	RNA_def_property_ui_text(prop, "Use Spread", "Processes spread effect. Spreads wet paint around surface.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurface_reset");
+	
+	prop= RNA_def_property(srna, "spread_speed", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "spread_speed");
+	RNA_def_property_range(prop, 0.001, 10.0);
+	RNA_def_property_ui_range(prop, 0.01, 5.0, 1, 2);
+	RNA_def_property_ui_text(prop, "Spread Speed", "How fast spread effect moves on the canvas surface.");
+	
+	prop= RNA_def_property(srna, "use_drip", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_boolean_sdna(prop, NULL, "effect", MOD_DPAINT_EFFECT_DO_DRIP);
+	RNA_def_property_ui_text(prop, "Use Drip", "Processes drip effect. Drips wet paint to gravity direction.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurface_reset");
+	
+	prop= RNA_def_property(srna, "use_shrink", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_boolean_sdna(prop, NULL, "effect", MOD_DPAINT_EFFECT_DO_SHRINK);
+	RNA_def_property_ui_text(prop, "Use Shrink", "Processes shrink effect. Shrinks paint areas.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaintSurface_reset");
+	
+	prop= RNA_def_property(srna, "shrink_speed", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "shrink_speed");
+	RNA_def_property_range(prop, 0.001, 10.0);
+	RNA_def_property_ui_range(prop, 0.01, 5.0, 1, 2);
+	RNA_def_property_ui_text(prop, "Shrink Speed", "How fast shrink effect moves on the canvas surface.");
+
+	prop= RNA_def_property(srna, "effector_weights", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "EffectorWeights");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Effector Weights", "");
+
+	/*
+	*   Output settings
+	*/
+	prop= RNA_def_property(srna, "premultiply", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_MULALPHA);
+	RNA_def_property_ui_text(prop, "Premultiply alpha", "Multiplies color by alpha. (Recommended for Blender input.)");
+	
+	prop= RNA_def_property(srna, "image_output_path", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "image_output_path");
+	RNA_def_property_ui_text(prop, "Output Path", "Directory/name to the textures");
+
+	/* output for primary surface data */
+	prop= RNA_def_property(srna, "output_name", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "output_name");
+	RNA_def_property_ui_text(prop, "Output name", "");
+
+	prop= RNA_def_property(srna, "do_output1", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_OUT1);
+	RNA_def_property_ui_text(prop, "Save layer", "");
+
+	/* output for secondary sufrace data */
+	prop= RNA_def_property(srna, "output_name2", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "output_name2");
+	RNA_def_property_ui_text(prop, "Output name", "");
+
+	prop= RNA_def_property(srna, "do_output2", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_OUT2);
+	RNA_def_property_ui_text(prop, "Save layer", "");
+	
+	prop= RNA_def_property(srna, "displacement", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_float_sdna(prop, NULL, "disp_depth");
+	RNA_def_property_range(prop, 0.01, 5.0);
+	RNA_def_property_ui_range(prop, 0.01, 5.0, 1, 2);
+	RNA_def_property_ui_text(prop, "Displace Strength", "Maximum level of intersection to store in the texture. Use same value as the displace method strength.");
+	
+	prop= RNA_def_property(srna, "image_fileformat", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "image_fileformat");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_image_fileformat);
+	RNA_def_property_ui_text(prop, "File Format", "");
+	
+	prop= RNA_def_property(srna, "disp_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "disp_type");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_disp_type);
+	RNA_def_property_ui_text(prop, "Data Type", "");
+
+	/* wave simulator settings */
+	prop= RNA_def_property(srna, "wave_damping", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "wave_damping");
+	RNA_def_property_range(prop, 0.001, 1.0);
+	RNA_def_property_ui_range(prop, 0.01, 1.0, 1, 2);
+	RNA_def_property_ui_text(prop, "Damping", "Wave damping factor.");
+
+	prop= RNA_def_property(srna, "wave_speed", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "wave_speed");
+	RNA_def_property_range(prop, 0.01, 3.0);
+	RNA_def_property_ui_range(prop, 0.01, 1.5, 1, 2);
+	RNA_def_property_ui_text(prop, "Speed", "Wave speed.");
+
+	prop= RNA_def_property(srna, "wave_timescale", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "wave_timescale");
+	RNA_def_property_range(prop, 0.01, 3.0);
+	RNA_def_property_ui_range(prop, 0.01, 1.5, 1, 2);
+	RNA_def_property_ui_text(prop, "Timescale", "Wave time scaling factor.");
+
+	prop= RNA_def_property(srna, "wave_spring", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "wave_spring");
+	RNA_def_property_range(prop, 0.001, 1.0);
+	RNA_def_property_ui_range(prop, 0.01, 1.0, 1, 2);
+	RNA_def_property_ui_text(prop, "Spring", "Spring force that pulls water level back to zero.");
+
+	prop= RNA_def_property(srna, "wave_open_borders", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_WAVE_OPEN_BORDERS);
+	RNA_def_property_ui_text(prop, "Open Borders", "Passes waves through mesh edges.");
+
+	
+	/* cache */
+	prop= RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "pointcache");
+	RNA_def_property_ui_text(prop, "Point Cache", "");
+
+	/* is cache used */
+	prop= RNA_def_property(srna, "uses_cache", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop, "rna_DynamicPaint_uses_cache_get", "rna_DynamicPaint_uses_cache_set");
+	RNA_def_property_ui_text(prop, "Uses Cache", "");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+}
+
+static void rna_def_dynamic_paint_canvas_settings(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna = RNA_def_struct(brna, "DynamicPaintCanvasSettings", NULL);
+	RNA_def_struct_ui_text(srna, "Canvas Settings", "Dynamic Paint canvas settings");
+	RNA_def_struct_sdna(srna, "DynamicPaintCanvasSettings");
+	RNA_def_struct_path_func(srna, "rna_DynamicPaintCanvasSettings_path");
+
+	/*
+	*	Surface Slots
+	*/
+	prop= RNA_def_property(srna, "canvas_surfaces", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_funcs(prop, "rna_DynamicPaint_surfaces_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0);
+	RNA_def_property_struct_type(prop, "DynamicPaintSurface");
+	RNA_def_property_ui_text(prop, "Paint Surface List", "Paint surface list");
+	rna_def_canvas_surfaces(brna, prop);
+
+	prop= RNA_def_property(srna, "ui_info", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "ui_info");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Bake Info", "Info on bake status");
+}
+
+static void rna_def_dynamic_paint_brush_settings(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* paint collision type */
+	static EnumPropertyItem prop_dynamicpaint_collisiontype[] = {
+			{MOD_DPAINT_COL_PSYS, "PSYS", ICON_PARTICLES, "Particle System", ""},
+			{MOD_DPAINT_COL_POINT, "POINT", ICON_META_EMPTY, "Object Center", ""},
+			{MOD_DPAINT_COL_DIST, "DISTANCE", ICON_META_EMPTY, "Proximity", ""},
+			{MOD_DPAINT_COL_VOLDIST, "VOLDIST", ICON_META_CUBE, "Mesh Volume + Proximity", ""},
+			{MOD_DPAINT_COL_VOLUME, "VOLUME", ICON_MESH_CUBE, "Mesh Volume", ""},
+			{0, NULL, 0, NULL, NULL}};
+
+	static EnumPropertyItem prop_dynamicpaint_prox_falloff[] = {
+			{MOD_DPAINT_PRFALL_SMOOTH, "SMOOTH", ICON_SPHERECURVE, "Smooth", ""},
+			{MOD_DPAINT_PRFALL_SHARP, "SHARP", ICON_NOCURVE, "Sharp", ""},
+			{MOD_DPAINT_PRFALL_RAMP, "RAMP", 0, "Color Ramp", ""},
+			{0, NULL, 0, NULL, NULL}};
+
+	static EnumPropertyItem prop_dynamicpaint_brush_wave_type[] = {
+			{MOD_DPAINT_WAVEB_DEPTH, "DEPTH", 0, "Obstacle", ""},
+			{MOD_DPAINT_WAVEB_FORCE, "FORCE", 0, "Force", ""},
+			{MOD_DPAINT_WAVEB_REFLECT, "REFLECT", 0, "Reflect Only", ""},
+			{0, NULL, 0, NULL, NULL}};
+
+	static EnumPropertyItem prop_dynamicpaint_brush_ray_dir[] = {
+			{MOD_DPAINT_RAY_CANVAS, "CANVAS", 0, "Canvas Normal", ""},
+			{MOD_DPAINT_RAY_ZPLUS, "ZPLUT", 0, "Z-Axis", ""},
+			{0, NULL, 0, NULL, NULL}};
+
+	static EnumPropertyItem buttons_dynamicpaint_settings_menu[] = {
+		{0, "GENERAL", ICON_MOD_DYNAMICPAINT, "", "Show general settings"},
+		//{1, "DISPLACE", ICON_MOD_DISPLACE, "", "Show displace related settings"},
+		{2, "WAVE", ICON_MOD_WAVE, "", "Show wave related settings"},
+		{0, NULL, 0, NULL, NULL}};
+
+	srna = RNA_def_struct(brna, "DynamicPaintBrushSettings", NULL);
+	RNA_def_struct_ui_text(srna, "Brush Settings", "Brush settings");
+	RNA_def_struct_sdna(srna, "DynamicPaintBrushSettings");
+	RNA_def_struct_path_func(srna, "rna_DynamicPaintBrushSettings_path");
+
+	prop= RNA_def_property(srna, "brush_settings_context", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, buttons_dynamicpaint_settings_menu);
+	RNA_def_property_enum_sdna(prop, NULL, "brush_settings_context");
+	RNA_def_property_ui_text(prop, "Brush Context", "");
+
+	/*
+	*   Paint
+	*/
+	prop= RNA_def_property(srna, "paint_color", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "r");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Paint Color", "Color of the paint.");
+	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING_DRAW, NULL);
+
+	prop= RNA_def_property(srna, "paint_alpha", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "alpha");
+	RNA_def_property_range(prop, 0.0, 10.0);
+	RNA_def_property_ui_range(prop, 0.0, 10.0, 5, 2);
+	RNA_def_property_ui_text(prop, "Paint Alpha", "Paint alpha.");
+	
+	prop= RNA_def_property(srna, "use_material", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_USE_MATERIAL);
+	RNA_def_property_ui_text(prop, "Use object material", "Use object material to define color and alpha.");
+
+	prop= RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "mat");
+	RNA_def_property_ui_text(prop, "Material", "Material to use. If not defined, material linked to the mesh is used.");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	
+	prop= RNA_def_property(srna, "absolute_alpha", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_ABS_ALPHA);
+	RNA_def_property_ui_text(prop, "Absolute Alpha", "Only increase alpha value if paint alpha is higher than existing.");
+	
+	prop= RNA_def_property(srna, "paint_wetness", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "wetness");
+	RNA_def_property_range(prop, 0.0, 1.0);
+	RNA_def_property_ui_range(prop, 0.0, 1.0, 5, 2);
+	RNA_def_property_ui_text(prop, "Paint Wetness", "Paint Wetness. Visible in wet map. Some effects only affect wet paint.");
+	
+	prop= RNA_def_property(srna, "paint_erase", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_ERASE);
+	RNA_def_property_ui_text(prop, "Erase Paint", "Erase / remove paint instead of adding it.");
+
+	prop= RNA_def_property(srna, "wave_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "wave_type");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_brush_wave_type);
+	RNA_def_property_ui_text(prop, "Paint Type", "");
+
+	prop= RNA_def_property(srna, "wave_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "wave_factor");
+	RNA_def_property_range(prop, -2.0, 2.0);
+	RNA_def_property_ui_range(prop, -1.0, 1.0, 5, 2);
+	RNA_def_property_ui_text(prop, "Factor", "Multiplier for wave strenght of this brush.");
+	
+	/*
+	*   Paint Area / Collision
+	*/
+	prop= RNA_def_property(srna, "paint_source", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "collision");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_collisiontype);
+	RNA_def_property_ui_text(prop, "Paint Source", "");
+
+	prop= RNA_def_property(srna, "accept_nonclosed", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_ACCEPT_NONCLOSED);
+	RNA_def_property_ui_text(prop, "Non-Closed", "Allows painting with non-closed meshes. Brush influence is defined by ray dir.");
+
+	prop= RNA_def_property(srna, "ray_dir", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "ray_dir");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_brush_ray_dir);
+	RNA_def_property_ui_text(prop, "Ray Dir", "Defines ray direction to use for non-closed meshes. If ray faces an opposite normal brush is processed.");
+	
+	prop= RNA_def_property(srna, "paint_distance", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "paint_distance");
+	RNA_def_property_range(prop, 0.0, 500.0);
+	RNA_def_property_ui_range(prop, 0.0, 500.0, 10, 3);
+	RNA_def_property_ui_text(prop, "Proximity Distance", "Maximum distance to mesh surface to affect paint.");
+	
+	prop= RNA_def_property(srna, "prox_ramp_alpha", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_RAMP_ALPHA);
+	RNA_def_property_ui_text(prop, "Only Use Alpha", "Only reads color ramp alpha.");
+	
+	prop= RNA_def_property(srna, "displace_distance", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "displace_distance");
+	RNA_def_property_range(prop, 0.0, 10.0);
+	RNA_def_property_ui_range(prop, 0.0, 10.0, 5, 3);
+	RNA_def_property_ui_text(prop, "Displace Distance", "Maximum distance to mesh surface to displace.");
+	
+	prop= RNA_def_property(srna, "prox_displace_strength", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "prox_displace_strength");
+	RNA_def_property_range(prop, 0.0, 1.0);
+	RNA_def_property_ui_range(prop, 0.0, 1.0, 5, 3);
+	RNA_def_property_ui_text(prop, "Strength", "How much of maximum intersection will be used in edges.");
+	
+	prop= RNA_def_property(srna, "prox_falloff", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "proximity_falloff");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_prox_falloff);
+	RNA_def_property_ui_text(prop, "Paint Falloff", "");
+	
+	prop= RNA_def_property(srna, "prox_facealigned", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_PROX_FACEALIGNED);
+	RNA_def_property_ui_text(prop, "Face Aligned", "Check proximity in face normal direction only.");
+
+	prop= RNA_def_property(srna, "prox_inverse", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_INVERSE_PROX);
+	RNA_def_property_ui_text(prop, "Inner", "Invert proximity to reduce effect inside the volume.");
+	
+
+	/*
+	*   Particle
+	*/
+	prop= RNA_def_property(srna, "psys", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "psys");
+	RNA_def_property_struct_type(prop, "ParticleSystem");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Particle Systems", "The particle system to paint with.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaint_resetDependancy");
+
+	
+	prop= RNA_def_property(srna, "use_part_radius", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_PART_RAD);
+	RNA_def_property_ui_text(prop, "Use Particle Radius", "Uses radius from particle settings.");
+	
+	prop= RNA_def_property(srna, "solid_radius", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "particle_radius");
+	RNA_def_property_range(prop, 0.01, 10.0);
+	RNA_def_property_ui_range(prop, 0.01, 2.0, 5, 3);
+	RNA_def_property_ui_text(prop, "Solid Radius", "Radius that will be painted solid.");
+
+	prop= RNA_def_property(srna, "smooth_radius", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "particle_smooth");
+	RNA_def_property_range(prop, 0.0, 10.0);
+	RNA_def_property_ui_range(prop, 0.0, 1.0, 5, 0);
+	RNA_def_property_ui_text(prop, "Smooth Radius", "Smooth falloff added after solid paint area.");
+	
+
+	/*
+	* Color ramps
+	*/
+	prop= RNA_def_property(srna, "paint_ramp", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "paint_ramp");
+	RNA_def_property_struct_type(prop, "ColorRamp");
+	RNA_def_property_ui_text(prop, "Paint Color Ramp", "Color ramp used to define proximity falloff.");
+}
+
+void RNA_def_dynamic_paint(BlenderRNA *brna)
+{
+	rna_def_dynamic_paint_canvas_settings(brna);
+	rna_def_dynamic_paint_brush_settings(brna);
+	rna_def_canvas_surface(brna);
+}
+
+#endif
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 9175806e2bb..805f9639ab1 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -138,6 +138,7 @@ void RNA_def_constraint(struct BlenderRNA *brna);
 void RNA_def_context(struct BlenderRNA *brna);
 void RNA_def_controller(struct BlenderRNA *brna);
 void RNA_def_curve(struct BlenderRNA *brna);
+void RNA_def_dynamic_paint(struct BlenderRNA *brna);
 void RNA_def_fluidsim(struct BlenderRNA *brna);
 void RNA_def_fcurve(struct BlenderRNA *brna);
 void RNA_def_gameproperty(struct BlenderRNA *brna);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index d2c1b862fee..f2b4dd8711c 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 
 #include "RNA_define.h"
+#include "RNA_enum_types.h"
 
 #include "rna_internal.h"
 
@@ -47,6 +48,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_bmesh.h" /* For BevelModifierData */
+#include "BKE_dynamicpaint.h" /* For dynamicPaint_Modifier_free & *_createType */
 #include "BKE_multires.h"
 #include "BKE_smoke.h" /* For smokeModifier_free & smokeModifier_createType */
 
@@ -91,6 +93,7 @@ EnumPropertyItem modifier_type_items[] ={
 	{eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
 	{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
 	{eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""},
+	{eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MOD_DYNAMICPAINT, "Dynamic Paint", ""},
 	{0, NULL, 0, NULL, NULL}};
 
 #ifdef RNA_RUNTIME
@@ -183,6 +186,8 @@ static StructRNA* rna_Modifier_refine(struct PointerRNA *ptr)
 			return &RNA_ScrewModifier;
 		case eModifierType_Warp:
 			return &RNA_WarpModifier;
+		case eModifierType_DynamicPaint:
+			return &RNA_DynamicPaintModifier;
 		default:
 			return &RNA_Modifier;
 	}
@@ -1937,6 +1942,31 @@ static void rna_def_modifier_smoke(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_Smoke_set_type");
 }
 
+static void rna_def_modifier_dynamic_paint(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+	
+	srna= RNA_def_struct(brna, "DynamicPaintModifier", "Modifier");
+	RNA_def_struct_ui_text(srna, "Dynamic Paint Modifier", "Dynamic Paint modifier");
+	RNA_def_struct_sdna(srna, "DynamicPaintModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_DYNAMICPAINT);
+	
+	prop= RNA_def_property(srna, "canvas_settings", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "canvas");
+	RNA_def_property_ui_text(prop, "Canvas Settings", "");
+	
+	prop= RNA_def_property(srna, "brush_settings", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "brush");
+	RNA_def_property_ui_text(prop, "Brush Settings", "");
+
+	prop= RNA_def_property(srna, "ui_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_enum_sdna(prop, NULL, "type");
+	RNA_def_property_enum_items(prop, prop_dynamicpaint_type_items);
+	RNA_def_property_ui_text(prop, "Type", "");
+}
+
 static void rna_def_modifier_collision(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -2504,6 +2534,7 @@ void RNA_def_modifier(BlenderRNA *brna)
 	rna_def_modifier_smoke(brna);
 	rna_def_modifier_solidify(brna);
 	rna_def_modifier_screw(brna);
+	rna_def_modifier_dynamic_paint(brna);
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index ca679239dd3..2a4ea815260 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -643,6 +643,22 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
 			if (smd->domain->effector_weights == ew)
 				return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", md->name);
 		}
+
+		/* check dynamic paint modifier */
+		md = (ModifierData *)modifiers_findByType(ob, eModifierType_DynamicPaint);
+		if (md) {
+			DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
+
+			if (pmd->canvas) {
+				DynamicPaintSurface *surface = pmd->canvas->surfaces.first;
+
+				for(; surface; surface=surface->next) {
+					if (surface->effector_weights == ew)
+						return BLI_sprintfN("modifiers[\"%s\"].canvas_settings.canvas_surfaces[\"%s\"].effector_weights",
+							md->name, surface->name);
+				}
+			}
+		}
 	}
 	return NULL;
 }
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index b79d5395eec..3e71a0e4811 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2163,6 +2163,11 @@ static void rna_def_space_time(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "cache_display", TIME_CACHE_SMOKE);
 	RNA_def_property_ui_text(prop, "Smoke", "Show the active object's smoke cache");	
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, NULL);
+		
+	prop= RNA_def_property(srna, "cache_dynamicpaint", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "cache_display", TIME_CACHE_DYNAMICPAINT);
+	RNA_def_property_ui_text(prop, "Dynamic PAint", "Show the active object's Dynamic Paint cache");	
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, NULL);
 }
 
 static void rna_def_console_line(BlenderRNA *brna)