diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-21 17:30:34 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-21 18:08:42 +0300 |
| commit | 991d4f1c6b661d9a6b00e073d9a01c8a8a133b12 (patch) | |
| tree | 5f2ca156d07e3155107a09d5c3cfb2b2db128880 /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | 318ad705ad366f457ada2e9fe5f6c43902bd62ae (diff) | |
Fix incorrect use of G.is_rendering for particles in some places.
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index ed2566c9bb5..2b3ef91678f 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -5890,6 +5890,7 @@ static int dynamicPaint_doStep( PaintSurfaceData *sData = surface->data; PaintBakeData *bData = sData->bData; DynamicPaintCanvasSettings *canvas = surface->canvas; + const bool for_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER); int ret = 1; if (sData->total_points < 1) @@ -5960,7 +5961,7 @@ static int dynamicPaint_doStep( /* Apply brush on the surface depending on it's collision type */ if (brush->psys && brush->psys->part && ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) && - psys_check_enabled(brushObj, brush->psys, G.is_rendering)) + psys_check_enabled(brushObj, brush->psys, for_render)) { /* Paint a particle system */ BKE_animsys_evaluate_animdata(depsgraph, scene, &brush->psys->part->id, brush->psys->part->adt, |