Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-12-06 14:30:59 +0300
committerJens Verwiebe <info@jensverwiebe.de>2014-12-06 14:30:59 +0300
commit81ae71fcd3ea1406f0bca05471c17d984738ff4c (patch)
tree1675c08ad6a0d27228def0df057897ee57ce02b2 /source
parent6e8a8a72a3ce00b3d16c0301fac0c2e24cf027a4 (diff)
Fix crash in RE_AcquiredResultGet32 on debug builds introduced yesterday
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/render/render_preview.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 42602f35deb..b36e4e22f01 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -561,8 +561,9 @@ static bool ed_preview_draw_rect(ScrArea *sa, int split, int first, rcti *rect,
unsigned char *rect_byte = MEM_mallocN(rres.rectx * rres.recty * sizeof(int), "ed_preview_draw_rect");
float fx = rect->xmin + offx;
float fy = rect->ymin;
+ if (re)
+ RE_AcquiredResultGet32(re, &rres, (unsigned int *)rect_byte);
- RE_AcquiredResultGet32(re, &rres, (unsigned int *)rect_byte);
glaDrawPixelsSafe(fx, fy, rres.rectx, rres.recty, rres.rectx, GL_RGBA, GL_UNSIGNED_BYTE, rect_byte);
MEM_freeN(rect_byte);