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/particle.c | |
| parent | 318ad705ad366f457ada2e9fe5f6c43902bd62ae (diff) | |
Fix incorrect use of G.is_rendering for particles in some places.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 693d6ac587e..494878bcc8e 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -256,7 +256,8 @@ struct LatticeDeformData *psys_create_lattice_deform_data(ParticleSimulationData if (psys_in_edit_mode(sim->depsgraph, sim->psys) == 0) { Object *lattice = NULL; ModifierData *md = (ModifierData *)psys_get_modifier(sim->ob, sim->psys); - int mode = G.is_rendering ? eModifierMode_Render : eModifierMode_Realtime; + bool for_render = DEG_get_mode(sim->depsgraph) == DAG_EVAL_RENDER; + int mode = for_render ? eModifierMode_Render : eModifierMode_Realtime; for (; md; md = md->next) { if (md->type == eModifierType_Lattice) { |