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:
Campbell Barton 2023-11-09 13:06:52 +11:00
parent 58ea0e051f 609ac5e378
commit 368b38be37
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/windowmanager/intern/wm_playanim.cc
View File

@ -2145,7 +2145,7 @@ static bool wm_main_playanim_intern(int argc, const char **argv, PlayArgs *args_
BLF_exit();
/* NOTE: Must happen before GPU Context destruction as GPU resources are released via
* Color Management module. */
* Color Management module. Must be re-initialized in the case of drag & drop. */
IMB_exit();
if (ps.ghost_data.gpu_context) {
@ -2161,6 +2161,9 @@ static bool wm_main_playanim_intern(int argc, const char **argv, PlayArgs *args_
/* Early exit, IMB and BKE should be exited only in end. */
if (ps.argv_next) {
/* Ensure drag & drop runs with a valid IMB state. */
IMB_init();
args_next->argc = ps.argc_next;
args_next->argv = ps.argv_next;
return true;