From 806ebc7c7a9b897794184dfbcedde7bffe691e9d Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 25 Nov 2004 18:16:50 +0000 Subject: [PATCH] Fix for #1806 View3d windows have 'unlock' option and 'localview', which was also supported on render (F12 with mouse in window) to render only what is visible there. This didn't work very nice, with even code in render module to read from interface variable. Removed that from render, and coded the exception where it belongs, in renderwin.c --- .../blender/renderconverter/intern/convertBlenderScene.c | 3 --- source/blender/src/renderwin.c | 9 ++++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index 8cf66a3ce0f..ca78e319e84 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -67,7 +67,6 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_meta_types.h" -#include "DNA_space_types.h" #include "BKE_anim.h" #include "BKE_armature.h" @@ -2964,9 +2963,7 @@ void RE_rotateBlenderScene(void) ob= ob->id.next; } - /* layers: render in foreground current 3D window */ lay= G.scene->lay; - if(G.vd) lay= G.vd->lay; sce= G.scene; base= G.scene->base.first; diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 0a6b6d6e91a..01d21053bf5 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -942,7 +942,14 @@ void BIF_renderwin_make_active(void) /* set up display, render an image or scene */ void BIF_do_render(int anim) { - do_render(NULL, anim, 0); + /* if start render in 3d win, use layer from window (e.g also local view) */ + if(curarea && curarea->spacetype==SPACE_VIEW3D) { + int lay= G.scene->lay; + G.scene->lay= G.vd->lay; + do_render(NULL, anim, 0); + G.scene->lay= lay; + } + else do_render(NULL, anim, 0); } /* set up display, render the current area view in an image */