diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-10-27 21:19:55 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-10-27 21:19:55 +0400 |
| commit | c64fa6a344981476dc5ebd85e6e7d83c5b8221aa (patch) | |
| tree | 69bb4e2451180f453e47ecdbbf794dccb018f789 /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | b6da3611ebba8f4a2493531688def2bc8e65be63 (diff) | |
Smoke/Dynamic Paint: Allow use of fluid sim generated particles as emitter/brush.
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 2a9f3bd920c..f34a0150c79 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -4892,7 +4892,7 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su /* Apply brush on the surface depending on it's collision type */ /* Particle brush: */ if (brush->collision == MOD_DPAINT_COL_PSYS) { - if (brush->psys && brush->psys->part && brush->psys->part->type == PART_EMITTER && + if (brush->psys && brush->psys->part && ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) && psys_check_enabled(brushObj, brush->psys)) { |