diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-05-12 17:15:41 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-05-12 17:15:41 +0400 |
| commit | 5fcf9b1d2fe94798178beeea8e31f54faac31414 (patch) | |
| tree | b58e66f5f63ea19a99a6dc0f99211ecc588ed24e /source/blender/editors | |
| parent | 40535f5ef3baaef5ba4d8c1f7abbbb7f1efe3b77 (diff) | |
3D viewport render preview:
- Put it available as a default now (no debug value needed)
- Fixed viewport size error, viewport was badly set
(visible with border render, property regions)
- Fixed hanging lock in conflict between drawing and initialize
new renders.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index b1ec1f5c099..41dfaf82f6b 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -854,10 +854,10 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda /* initalize always */ if (render_view3d_disprect(rp->scene, rp->ar, rp->v3d, rp->rv3d, &cliprct)) { rdata.mode |= R_BORDER; - RE_InitState(re, NULL, &rdata, NULL, rp->sa->winx, rp->sa->winy, &cliprct); + RE_InitState(re, NULL, &rdata, NULL, rp->ar->winx, rp->ar->winy, &cliprct); } else - RE_InitState(re, NULL, &rdata, NULL, rp->sa->winx, rp->sa->winy, NULL); + RE_InitState(re, NULL, &rdata, NULL, rp->ar->winx, rp->ar->winy, NULL); } if (orth) @@ -1030,7 +1030,7 @@ void render_view3d_draw(RenderEngine *engine, const bContext *C) if (rres.rectf) { unsigned char *rect_byte = MEM_mallocN(rres.rectx * rres.recty * sizeof(int), "ed_preview_draw_rect"); - RE_ResultGet32(re, (unsigned int *)rect_byte); + RE_AcquiredResultGet32(re, &rres, (unsigned int *)rect_byte); glEnable(GL_BLEND); glColor4f(1.0f, 1.0f, 1.0f, 1.0f); diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 23a3288209d..34903c26ca0 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -563,7 +563,7 @@ static int ed_preview_draw_rect(ScrArea *sa, int split, int first, rcti *rect, r float fx = rect->xmin + offx; float fy = rect->ymin; - RE_ResultGet32(re, (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); |