diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-18 22:41:20 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-18 22:41:20 +0400 |
| commit | 40d4f34e82338b98d05595175504120fd98ae680 (patch) | |
| tree | 8d352425ed6a3f1e23435be0152e1b77ea1cf097 /source/blender/modifiers/intern/MOD_dynamicpaint.c | |
| parent | 71211818be68b3bf810270e0c9c716f3274e1cf0 (diff) | |
Dynamic Paint:
* Added vertex weight painting.
* Added dissolve/fade setting for every surface type.
* Restored image format and displace type selection for image sequences.
* Fixed a possible crash when OpenMP enabled.
* Attempt to fix surface rna paths.
* Fixed compile warnings.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_dynamicpaint.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index 3b021863090..18956a213de 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -58,6 +58,7 @@ static CustomDataMask requiredDataMask(Object *ob, ModifierData *md) dataMask |= (1 << CD_MTFACE); dataMask |= (1 << CD_MCOL); + dataMask |= (1 << CD_MDEFORMVERT); return dataMask; } @@ -86,7 +87,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, - Object *UNUSED(ob), + Object *ob, DagNode *obNode) { DynamicPaintModifierData *pmd = (DynamicPaintModifierData*) md; @@ -133,6 +134,7 @@ ModifierTypeInfo modifierType_DynamicPaint = { /* structSize */ sizeof(DynamicPaintModifierData), /* type */ eModifierTypeType_Constructive, /* flags */ eModifierTypeFlag_AcceptsMesh + | eModifierTypeFlag_UsesPointCache | eModifierTypeFlag_Single, /* copyData */ copyData, @@ -148,6 +150,7 @@ ModifierTypeInfo modifierType_DynamicPaint = { /* isDisabled */ 0, /* updateDepgraph */ updateDepgraph, /* dependsOnTime */ dependsOnTime, + /* dependsOnNormals */ 0, /* foreachObjectLink */ 0, /* foreachIDLink */ foreachIDLink, }; |