[Bf-blender-cvs] [bfd8bd2dd95] temp-workspace-changes: Fix thumbnail save crashes

Dalai Felinto noreply at git.blender.org
Wed Sep 13 19:53:13 CEST 2017


Commit: bfd8bd2dd953b2480db5a4cfacf992d16b0ad4e7
Author: Dalai Felinto
Date:   Wed Sep 13 19:53:08 2017 +0200
Branches: temp-workspace-changes
https://developer.blender.org/rBbfd8bd2dd953b2480db5a4cfacf992d16b0ad4e7

Fix thumbnail save crashes

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 2343b040e0f..da5ea499d47 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -3147,7 +3147,10 @@ void DRW_draw_view(const bContext *C)
  */
 static const char *render_engine_get(Scene *scene, const WorkSpace *workspace)
 {
-	if (DRW_state_is_scene_render() || BKE_workspace_use_scene_settings_get(workspace)) {
+	if (DRW_state_is_scene_render() ||
+	    (workspace == NULL) || /* When writing file thumbnails, it's not scene render and we don't have UI. */
+	    BKE_workspace_use_scene_settings_get(workspace))
+	{
 		return scene->r.engine;
 	}
 	else {



More information about the Bf-blender-cvs mailing list