diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-13 16:43:36 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-13 16:43:36 +0300 |
commit | c9aef27326d54ed053edb37d27fe5571805139b9 (patch) | |
tree | 1455a2f704b8187d3770a009054e880c97edfbc3 /source/blender/render | |
parent | 065cd6e4e4295063bfdf952ffd18931736b065c2 (diff) |
Depsgraph: Begin work on making depsgraph per-scene-layer
This is a first step towards proper depsgraph "ownership", where
we would allow scene to be in multiple states dependent on active
workspace or scene layer.
This commit introduces a basic API to get proper dependency graph
for a given scene layer. It also renames scene->depsgraph to
depsgraph_legacy, so it's easier to search0-n-replace in the future.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index f7b0bbd8324..4581e0bdea0 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -64,6 +64,7 @@ #include "BKE_colortools.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_layer.h" #include "BKE_library.h" #include "BKE_library_remap.h" #include "BKE_main.h" @@ -3795,6 +3796,8 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri void RE_PreviewRender(Render *re, Main *bmain, Scene *sce) { Object *camera; + /* TODO(sergey): Get proper scene layer here. */ + SceneLayer *scene_layer = BKE_scene_layer_context_active_ex(bmain, sce); int winx, winy; winx = (sce->r.size * sce->r.xsch) / 100; @@ -3808,7 +3811,7 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce) re->scene = sce; re->scene_color_manage = BKE_scene_check_color_management_enabled(sce); re->lay = sce->lay; - re->depsgraph = sce->depsgraph; + re->depsgraph = BKE_scene_get_depsgraph(sce, scene_layer); camera = RE_GetCamera(re); RE_SetCamera(re, camera); |