Commit: 27ef012ac7674498e171d679c655bbe5c709e181
Author: Brecht Van Lommel
Date: Thu May 14 03:42:09 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB27ef012ac7674498e171d679c655bbe5c709e181
Fix T52782: crash rendering more virtual parent particles than children
===================================================================
M source/blender/blenkernel/intern/particle.c
===================================================================
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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
