diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-05-14 05:19:11 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-05-14 05:19:11 +0300 |
commit | 1fadda344ca5349e55c19d8472e40f7e45e9e47f (patch) | |
tree | 722014edf31f0b7f8d5b4253a79051e63dad3429 /source | |
parent | db1099c0aeec3b793296808c77ea8eb9abad33f0 (diff) | |
parent | 4341b5b2fe722be7165896d8ce6502f4a158e878 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 19342090eb7..2f2d3aded31 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; } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index d935f7dbb40..c910f1d2382 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; |