Revision: 43029
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43029
Author: miikah
Date: 2011-12-31 10:28:36 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-12-31 09:37:19 UTC (rev 43028)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-12-31 10:28:36 UTC (rev 43029)
@@ -510,8 +510,6 @@
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 @@
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 @@
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 @@
}
}
- /* 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 @@
}
/* 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;
Modified: trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
2011-12-31 09:37:19 UTC (rev 43028)
+++ trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
2011-12-31 10:28:36 UTC (rev 43029)
@@ -433,7 +433,7 @@
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 @@
/* 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 @@
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");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
