From 27ef012ac7674498e171d679c655bbe5c709e181 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 14 May 2020 03:42:09 +0200 Subject: [PATCH 1/2] Fix T52782: crash rendering more virtual parent particles than children --- source/blender/blenkernel/intern/particle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } From 4341b5b2fe722be7165896d8ce6502f4a158e878 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Thu, 14 May 2020 04:01:30 +0200 Subject: [PATCH 2/2] Fix T59954: View all Sequences doesn't show all sequences Set boundbox_seq start X minimum value to SFRA. This should be part of rBf66b5edf98c9, but I forgot to include this change. --- source/blender/editors/space_sequencer/sequencer_edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index edbd52f4d53..8624da9e8c2 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -255,7 +255,7 @@ void boundbox_seq(Scene *scene, rctf *rect) return; } - min[0] = 0.0; + min[0] = SFRA; max[0] = EFRA + 1; min[1] = 0.0; max[1] = 8.0;