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:
authorBrecht Van Lommel <brecht@blender.org>2020-05-14 04:42:09 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-14 04:42:09 +0300
commit27ef012ac7674498e171d679c655bbe5c709e181 (patch)
tree13bf0d4570515777d7e3d4ebd8bf2bedeb214252 /source/blender/blenkernel/intern/particle.c
parentec324d87411b1e6ae9285eab2efcecb479d4dd46 (diff)
Fix T52782: crash rendering more virtual parent particles than children
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r--source/blender/blenkernel/intern/particle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 0e35fa5d19f..56d114ebab5 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2383,9 +2383,10 @@ static bool psys_thread_context_init_path(ParticleThreadContext *ctx,
}
else {
totchild = (int)((float)totchild * (float)part->disp / 100.0f);
- totparent = MIN2(totparent, totchild);
}
+ totparent = MIN2(totparent, totchild);
+
if (totchild == 0) {
return false;
}