[Bf-blender-cvs] [179fff9] master: Revert "Fix T44556: Crash on the World Properties > Preview"

Dalai Felinto noreply at git.blender.org
Thu Apr 30 17:12:26 CEST 2015


Commit: 179fff94e8a1977af95fe30f98f1a2b81699089a
Author: Dalai Felinto
Date:   Thu Apr 30 10:22:47 2015 -0300
Branches: master
https://developer.blender.org/rB179fff94e8a1977af95fe30f98f1a2b81699089a

Revert "Fix T44556: Crash on the World Properties > Preview"

This reverts commit 4bcc7a2ec6bf6937778a2227c7f938c50a0fafe5.

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

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 b9aa6ac..2c353c1 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -532,7 +532,6 @@ static bool ed_preview_draw_rect(ScrArea *sa, int split, int first, rcti *rect,
 	int newx = BLI_rcti_size_x(rect);
 	int newy = BLI_rcti_size_y(rect);
 	bool ok = false;
-	bool has_rectf = false;
 
 	if (!split || first) sprintf(name, "Preview %p", (void *)sa);
 	else sprintf(name, "SecondPreview %p", (void *)sa);
@@ -552,14 +551,11 @@ static bool ed_preview_draw_rect(ScrArea *sa, int split, int first, rcti *rect,
 	re = RE_GetRender(name);
 
 	RE_AcquireResultImageViews(re, &rres);
-	/* TODO(sergey): Is there a cleaner way to do this? */
-	if (!BLI_listbase_is_empty(&rres.views)) {
-		/* material preview only needs monoscopy (view 0) */
-		rv = RE_RenderViewGetById(&rres, 0);
-		has_rectf = rv->rectf != NULL;
-	}
 
-	if (has_rectf) {
+	/* material preview only needs monoscopy (view 0) */
+	rv = RE_RenderViewGetById(&rres, 0);
+
+	if (rv->rectf) {
 		
 		if (ABS(rres.rectx - newx) < 2 && ABS(rres.recty - newy) < 2) {




More information about the Bf-blender-cvs mailing list