From a4b5c05aadf5a258fdc4e52596e20c9ca88607f2 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 15 May 2013 17:09:45 +0000 Subject: Fixes for blender internal viewport render: * Particles did not render at viewport resolution like meshes. * Properties editor preview render of hair was crashing, solution is to have two separate flags for this preview render and viewport preview render. --- source/blender/editors/render/render_internal.c | 2 +- source/blender/editors/render/render_preview.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/render') diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 293eba0f658..a172287113f 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -853,7 +853,7 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda rdata = rp->scene->r; rdata.mode &= ~(R_OSA | R_MBLUR | R_BORDER | R_PANORAMA); rdata.scemode &= ~(R_DOSEQ | R_DOCOMP | R_FREE_IMAGE); - rdata.scemode |= R_PREVIEWBUTS; + rdata.scemode |= R_VIEWPORT_PREVIEW; /* we do use layers, but only active */ rdata.scemode |= R_SINGLE_LAYER; diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 34903c26ca0..76fa79029fd 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -273,7 +273,7 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre if (sce) { /* this flag tells render to not execute depsgraph or ipos etc */ - sce->r.scemode |= R_PREVIEWBUTS; + sce->r.scemode |= R_BUTS_PREVIEW; /* set world always back, is used now */ sce->world = pr_main->world.first; /* now: exposure copy */ -- cgit v1.2.3