Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 4bcc7a2ec6.
This commit is contained in:
Dalai Felinto
2015-04-30 10:22:47 -03:00
parent 69ef1a3a83
commit 179fff94e8
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/render/render_preview.c
View File

@@ -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) {