diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
| commit | 78a4e2461419f026d53e409cb75073ba5f47e1bb (patch) | |
| tree | 2847f536bee9b51a0d30f59baf6becc22a8acffd /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | 81f5c9ed9b8193864f1c6160aed9eef9338f0d27 (diff) | |
| parent | bac6757ea0b1c873b8dd8221592ea95eed8d5bac (diff) | |
svn merge ^/trunk/blender -r43009:43033
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 0c5d5f238ff..294b4e4bde4 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; @@ -2285,7 +2283,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; @@ -2365,7 +2363,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; @@ -2395,10 +2393,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 @@ -2411,12 +2407,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; |