diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-07-08 15:03:37 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-07-08 15:03:37 +0400 |
| commit | f8f1cbd17f2b0c624d88ee7f7502e544472b4b6e (patch) | |
| tree | 498fa319d91816109a7bd08f10ebfe7dc1c2c984 /source/blender/modifiers/intern/MOD_dynamicpaint.c | |
| parent | 901f24716b70e961a28fabc5820ced0983b025e0 (diff) | |
Dynamic Paint:
* Canvas and brush can be now enabled simultaneously. This way it's possible for two canvases to interact.
* Added basic anti-aliasing support for vertex surfaces.
* 3D-view color preview now works even when there's subsurf modifier after Dynamic Paint in modifier stack.
* Added a new brush option to use proximity from object center.
* Default surface frame range now use scene's start and end values.
* Improved ray checks for volume brushes.
* Added new "non-closed" option for volume brushes. This way it's possible to use planar meshes as "volume" brushes with predefined ray direction.
* New carrot branch splash image by CGEffex.
* Improved brush affection code.
* Lots of smaller improvements.
* Fixed: Weight paint didn't work with particles.
* Fixed: Point cache didn't work for non-wave surfaces anymore since last commit.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_dynamicpaint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index 18956a213de..7d2eccf8e81 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -35,7 +35,7 @@ static void initData(ModifierData *md) pmd->canvas = NULL; pmd->brush = NULL; - pmd->type = 0; + pmd->type = MOD_DYNAMICPAINT_TYPE_CANVAS; } static void copyData(ModifierData *md, ModifierData *target) @@ -93,14 +93,14 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, DynamicPaintModifierData *pmd = (DynamicPaintModifierData*) md; /* add relation from canvases to all brush objects */ - if(pmd && (pmd->type & MOD_DYNAMICPAINT_TYPE_CANVAS) && pmd->canvas) + if(pmd && pmd->canvas) { Base *base = scene->base.first; for(; base; base = base->next) { DynamicPaintModifierData *pmd2 = (DynamicPaintModifierData *)modifiers_findByType(base->object, eModifierType_DynamicPaint); - if(pmd2 && (pmd2->type & MOD_DYNAMICPAINT_TYPE_BRUSH) && pmd2->brush) + if(pmd2 && pmd2->brush && ob!=base->object) { DagNode *brushNode = dag_get_node(forest, base->object); dag_add_relation(forest, brushNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Dynamic Paint Brush"); @@ -119,7 +119,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, { DynamicPaintModifierData *pmd = (DynamicPaintModifierData*) md; - if(pmd->type==MOD_DYNAMICPAINT_TYPE_CANVAS && pmd->canvas) { + if(pmd->canvas) { DynamicPaintSurface *surface = pmd->canvas->surfaces.first; for(; surface; surface=surface->next) { |