Dynamic Paint:

* Fix: Smudge and brush velocity settings didn't work for "image sequence" surfaces unless any paint effect was enabled.
* Adjusted some property ranges.

2 files changed, 8 insertions, 13 deletions

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 955e747eded..567cc5ce07f 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -510,8 +510,6 @@ static void scene_setSubframe(Scene *scene, float subframe)
 	scene->r.subframe = subframe;
 }
 
-#define BRUSH_USES_VELOCITY (1<<0)
-
 static int surface_getBrushFlags(DynamicPaintSurface *surface, Scene *scene)
 {
 	Base *base = NULL;
@@ -2291,7 +2289,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
 							tPoint->quad = (isInside == 2) ? 1 : 0;		/* quad or tri part*/
 
 							/* save vertex indexes	*/
-							tPoint->v1 = mface[i].v1; /* (isInside == 2) ? mface[i].v1 : mface[i].v1; */ /* same! */
+							tPoint->v1 = mface[i].v1;
 							tPoint->v2 = (isInside == 2) ? mface[i].v3 : mface[i].v2;
 							tPoint->v3 = (isInside == 2) ? mface[i].v4 : mface[i].v3;
 
@@ -2371,7 +2369,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
 									tPoint->quad = tempPoints[ind].quad;		// quad or tri
 
 									/* save vertex indexes	*/
-									tPoint->v1 = (tPoint->quad) ? mface[i].v1 : mface[i].v1;
+									tPoint->v1 = mface[i].v1;
 									tPoint->v2 = (tPoint->quad) ? mface[i].v3 : mface[i].v2;
 									tPoint->v3 = (tPoint->quad) ? mface[i].v4 : mface[i].v3;
 
@@ -2401,10 +2399,8 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
 			}
 		}
 
-		/*	If any effect enabled, create surface effect / wet layer
-		*	neighbour lists. Processes possibly moving data. */
-		if (surface_usesAdjData(surface)) {
-
+		/*	Generate surface adjacency data. */
+		{
 			int i, cursor=0;
 
 			/* Create a temporary array of final indexes (before unassigned
@@ -2417,12 +2413,11 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
 			}
 			/* allocate memory */
 			sData->total_points = w*h;
-			dynamicPaint_initAdjacencyData(surface, 0);
+			dynamicPaint_initAdjacencyData(surface, 1);
 
 			if (sData->adj_data) {
 				PaintAdjData *ed = sData->adj_data;
 				unsigned int n_pos = 0;
-				//#pragma omp parallel for schedule(static)
 				for (ty = 0; ty < h; ty++)
 				{
 					int tx;
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c
index d06ab63ca8a..4886a4f30b1 100644
--- a/source/blender/makesrna/intern/rna_dynamicpaint.c
+++ b/source/blender/makesrna/intern/rna_dynamicpaint.c
@@ -433,7 +433,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
 	
 	prop= RNA_def_property(srna, "frame_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_range(prop, 0.0, 20.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");
 	
@@ -618,7 +618,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
 
 	/* wave simulator settings */
 	prop= RNA_def_property(srna, "wave_damping", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_range(prop, 0.001, 1.0);
+	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_range(prop, 0.01, 1.0, 1, 2);
 	RNA_def_property_ui_text(prop, "Damping", "Wave damping factor");
 
@@ -633,7 +633,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
 	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_range(prop, 0.001, 1.0);
+	RNA_def_property_range(prop, 0.0, 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");