[Bf-blender-cvs] [d99532e1d8f] blender2.8: Fix crahs when doing preview from a scene withotu world

Sergey Sharybin noreply at git.blender.org
Mon Jul 24 17:43:24 CEST 2017


Commit: d99532e1d8fd49019003046dcf471c85a52e0398
Author: Sergey Sharybin
Date:   Mon Jul 24 17:42:55 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBd99532e1d8fd49019003046dcf471c85a52e0398

Fix crahs when doing preview from a scene withotu world

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

M	source/blender/editors/render/render_preview.c

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

diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index f10cf034f7e..a9a469b4e46 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -320,6 +320,9 @@ static void set_preview_layer(SceneLayer *scene_layer, char pr_type)
 
 static World *preview_get_localized_world(ShaderPreview *sp, World *world)
 {
+	if (world == NULL) {
+		return NULL;
+	}
 	if (sp->worldcopy != NULL) {
 		return sp->worldcopy;
 	}




More information about the Bf-blender-cvs mailing list