Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Pozo <pragma37>2020-01-27 19:36:50 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-27 19:38:21 +0300
commit6bf0e9dbb1c68c183cf48ee2c7c0ca10c53f9075 (patch)
tree9ccbfda7b67ab0a7e7fb1a1538ee0dcea3b5b39c /source/blender/modifiers
parentf4f57ed21aa639e962fb3a28a63cc277e9f5c3ed (diff)
Fix particle instance modifier generating NaN polygons in some cases
Particles that don't exist should not be used, for example due to a density texture. Differential Revision: https://developer.blender.org/D6561
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_particleinstance.c3
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) {