blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Richard Antalik 2020-05-14 04:19:11 +02:00
parent db1099c0ae 4341b5b2fe
commit 1fadda344c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/particle.c
View File

@ -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;
}

2
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@ -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;