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-10-31 17:01:06 +0400
committerMiika Hamalainen <blender@miikah.org>2011-10-31 17:01:06 +0400
commit0a37e6ab976344818483df899b4fc44aedb30613 (patch)
tree4e7fb040788d18cce1e818440350940f5b397b27 /source/blender/modifiers/intern/MOD_dynamicpaint.c
parent46ae692710467d3622f58e0c5ce371674a6a7d9b (diff)
Dynamic Paint:
* Redesigned alpha blending and paint drying algorithms. Now it gives much better results when using low brush alpha or when surface has initial color set. * Fix: "Slow" dissolve/dry was scaled incorrect when using substeps. Also adjusted time to better match non-"slow" setting. * Fixed possible issues when using image textured brush. * Fix: particle brush panel was no longer visible since last commit. * Adjusted default surface values. * Some more code cleanup.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
-rw-r--r--source/blender/modifiers/intern/MOD_dynamicpaint.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index df1eb662a8c..e6272834ef0 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -79,7 +79,7 @@ static CustomDataMask requiredDataMask(Object *ob, ModifierData *md)
}
if (pmd->brush) {
- if (pmd->brush->mat) {
+ if (pmd->brush->flags & MOD_DPAINT_USE_MATERIAL) {
dataMask |= (1 << CD_MTFACE);
}
}