tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.0-release'

This commit is contained in:
Nathan Vegdahl 2023-10-31 16:07:56 +01:00
parent 0d861a93a6 5974a4482a
commit 729e29618b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/workbench/workbench_engine.cc
View File

@ -781,6 +781,9 @@ static void workbench_render_to_image(void *vedata,
/* Perform render step between samples to allow
* flushing of freed GPUBackend resources. */
if (GPU_backend_get_type() == GPU_BACKEND_METAL) {
GPU_flush();
}
GPU_render_step();
GPU_FINISH_DELIMITER();
} while (ved->instance->scene_state.sample + 1 < ved->instance->scene_state.samples_len);

6
source/blender/editors/space_nla/nla_edit.cc
View File

@ -1276,6 +1276,12 @@ static int nlaedit_delete_exec(bContext *C, wmOperator * /*op*/)
/* if selected, delete */
if (strip->flag & NLASTRIP_FLAG_SELECT) {
/* Fix for #109430. Defensively exit tweak mode before deleting
* the active strip. */
if (ale->adt && ale->adt->actstrip == strip) {
BKE_nla_tweakmode_exit(ale->adt);
}
/* if a strip either side of this was a transition, delete those too */
if ((strip->prev) && (strip->prev->type == NLASTRIP_TYPE_TRANSITION)) {
BKE_nlastrip_remove_and_free(&nlt->strips, strip->prev, true);