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-09-05 20:04:15 +0400
committerMiika Hamalainen <blender@miikah.org>2011-09-05 20:04:15 +0400
commit79ef35889f850aa7173800bcf67918c14f3b1291 (patch)
tree198618ec4a98e50a1123ea94c093788413ca18dc /source/blender/modifiers/intern/MOD_dynamicpaint.c
parent39b66f9ad4239865f25853eea3cbf48e4853a266 (diff)
Dynamic Paint:
* Added "Initial Color" setting for surfaces. You can for example set color from UV mapped texture or from vertex colors. * Added clamping option for "wave" brushes. * Merged smudge and drip adjacency search code. This fixes some issues with drip effect and makes code easier to maintain. * Some adjustments to the bounding box generation code. * OpenMP is now completely disabled if no compile flag is set. * Wetness values are now properly clamped on vertex surfaces. No more black dots on >1.0 wetness. * Textured brushes now use same function calls as internal renderer, instead of modified duplicates. * Moved operator code to editors/physics/. * Re-enabled some particle brush optimizations. * Fixed sometimes incorrect volume brush influence. * Fixed possible crash when using a brush that uses "Voxel Data" texture simultaneously with material preview or render. * Fixed texture mapping issues for "Object Center" brush. * Fixed possible crash/corruption when duplicating brush object that uses color ramps. * Other tweaking and code cleanup.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
-rw-r--r--source/blender/modifiers/intern/MOD_dynamicpaint.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index 58d7890b0ce..1e011146c82 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -112,6 +112,7 @@ static void foreachIDLink(ModifierData *md, Object *ob,
for(; surface; surface=surface->next) {
walk(userData, ob, (ID **)&surface->brush_group);
+ walk(userData, ob, (ID **)&surface->init_texture);
}
}
if (pmd->brush) {
@@ -119,6 +120,12 @@ static void foreachIDLink(ModifierData *md, Object *ob,
}
}
+static void foreachTexLink(ModifierData *md, Object *ob,
+ TexWalkFunc walk, void *userData)
+{
+ walk(userData, ob, md, ""); /* property name isn't used */
+}
+
ModifierTypeInfo modifierType_DynamicPaint = {
/* name */ "Dynamic Paint",
/* structName */ "DynamicPaintModifierData",
@@ -144,4 +151,5 @@ ModifierTypeInfo modifierType_DynamicPaint = {
/* dependsOnNormals */ 0,
/* foreachObjectLink */ 0,
/* foreachIDLink */ foreachIDLink,
+ /* foreachTexLink */ foreachTexLink,
};