Commit: 81ae71fcd3ea1406f0bca05471c17d984738ff4c
Author: Jens Verwiebe
Date: Sat Dec 6 12:30:59 2014 +0100
Branches: master
https://developer.blender.org/rB81ae71fcd3ea1406f0bca05471c17d984738ff4c
Fix crash in RE_AcquiredResultGet32 on debug builds introduced yesterday
===================================================================
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 42602f3..b36e4e2 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
