[Bf-blender-cvs] [0cfce7e] ui-preview-buttons: fixing crash with deferred previews

Ines Almeida noreply at git.blender.org
Fri May 8 21:50:51 CEST 2015


Commit: 0cfce7e596c28c31890b5e0bc896445720359212
Author: Ines Almeida
Date:   Fri May 8 20:50:47 2015 +0100
Branches: ui-preview-buttons
https://developer.blender.org/rB0cfce7e596c28c31890b5e0bc896445720359212

fixing crash with deferred previews

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

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 ab69b28..b5768af 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1070,7 +1070,7 @@ static void icon_preview_startjob_all_sizes(void *customdata, short *stop, short
 		sp->pr_rect = cur_size->rect;
 		sp->id = ip->id;
 
-		if (use_new_shading) {
+		if (use_new_shading && ip->id) {
 			/* texture icon rendering is hardcoded to use BI,
 			 * so don't even think of using cycle's bmain for
 			 * texture icons




More information about the Bf-blender-cvs mailing list