Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Hamalainen <blender@miikah.org>2011-08-03 22:31:48 +0400
committerMiika Hamalainen <blender@miikah.org>2011-08-03 22:31:48 +0400
commit8394f65d4a6019ae623fe32268a769463a189b9e (patch)
tree4338758f689e63d7fdd4752685e16eae42d1401e /source/blender/modifiers/intern/MOD_dynamicpaint.c
parent35720a4c075c2a0782af173519097a094b5c0165 (diff)
Dynamic Paint:
* Object velocity can now be used to determine brush influence and color. * Brushes can now be set to "smudge" existing paint. * Added new operators to easily add and remove surface output mesh data layers from Dynamic Paint ui. * Fixed drip effect algorithm to work properly on forces pointing towards surface. * Adjusted drip effect speed. * Drip effect can now use canvas velocity and acceleration to influence drip direction. * Fixed texture mapping for material enabled brushes. * "Object Center" type brushes can now use "material color" as well. * Improved surface partitioning grid generation algorithm. * Fixed possible invalid brush collision detection when OpenMP enabled. * Fixed incorrect random sized particle displace/wave influence. * Fixed "Object Center" brush color ramp falloff. * Fixed invalid zero alpha sampling when rendering vertex colors. * Lots of smaller tweaking.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
-rw-r--r--source/blender/modifiers/intern/MOD_dynamicpaint.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index ba01b1f36ba..58d7890b0ce 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -63,26 +63,14 @@ static CustomDataMask requiredDataMask(Object *ob, ModifierData *md)
return dataMask;
}
-/*static void deformVerts(
- ModifierData *md, Object *ob, DerivedMesh *derivedData,
- float (*vertexCos)[3], int numVerts, int useRenderParams, int isFinalCalc)*/
-
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
DerivedMesh *dm,
int useRenderParams,
int isFinalCalc)
{
DynamicPaintModifierData *pmd = (DynamicPaintModifierData*) md;
- //DerivedMesh *dm = get_cddm(ob, NULL, derivedData, vertexCos);
- DerivedMesh *result;
-
-
- result = dynamicPaint_Modifier_do(pmd, md->scene, ob, dm);
-
- /*if(dm != derivedData)
- dm->release(dm);*/
- return result;
+ return dynamicPaint_Modifier_do(pmd, md->scene, ob, dm);
}
static void updateDepgraph(ModifierData *md, DagForest *forest,