[Bf-blender-cvs] [e53f3954a44] blender-v3.0-release: Fix T93949: Preview Image Error When No Screen

Harley Acheson noreply at git.blender.org
Tue Jan 11 10:38:40 CET 2022


Commit: e53f3954a44b3d527cf2ef3ad8bd9c23ca810817
Author: Harley Acheson
Date:   Tue Dec 14 13:50:40 2021 -0800
Branches: blender-v3.0-release
https://developer.blender.org/rBe53f3954a44b3d527cf2ef3ad8bd9c23ca810817

Fix T93949: Preview Image Error When No Screen

Fix an error if "File Preview Type" is "Auto" and there is no screen.

See D13574 for details.

Differential Revision: https://developer.blender.org/D13574

Reviewed by Julian Eisel

===================================================================

M	source/blender/windowmanager/intern/wm_files.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index e95ce98352a..c21567eaaf6 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1820,8 +1820,9 @@ static bool wm_file_write(bContext *C,
 
       if (file_preview_type == USER_FILE_PREVIEW_AUTO) {
         Scene *scene = CTX_data_scene(C);
-        bool do_render = (scene != NULL && scene->camera != NULL &&
-                          (BKE_screen_find_big_area(CTX_wm_screen(C), SPACE_VIEW3D, 0) != NULL));
+        bScreen *screen = CTX_wm_screen(C);
+        bool do_render = (scene != NULL && scene->camera != NULL && screen != NULL &&
+                          (BKE_screen_find_big_area(screen, SPACE_VIEW3D, 0) != NULL));
         file_preview_type = do_render ? USER_FILE_PREVIEW_CAMERA : USER_FILE_PREVIEW_SCREENSHOT;
       }



More information about the Bf-blender-cvs mailing list