diff options
| author | mano-wii <germano.costa@ig.com.br> | 2020-01-27 20:17:51 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2020-01-27 20:17:51 +0300 |
| commit | 67f3941dd592d8a02d86450e303b6b7e50857c9c (patch) | |
| tree | 1b363ee981eee06d065db6176f6c1b8369bcd2c0 /source/blender/modifiers | |
| parent | 20e803ac6bc655d4d7ffbf02e797b4ab1f3ba0ed (diff) | |
| parent | c8103efbe3bfa2487a2866a7cf22e3b7681338ef (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 49bb8691764..f4c2e78d1ac 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -164,6 +164,9 @@ static bool particle_skip(ParticleInstanceModifierData *pimd, ParticleSystem *ps if (pa->alive == PARS_DEAD && (pimd->flag & eParticleInstanceFlag_Dead) == 0) { return true; } + if (pa->flag & (PARS_UNEXIST | PARS_NO_DISP)) { + return true; + } } if (pimd->particle_amount == 1.0f) { |