diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-01 15:55:59 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-02 16:13:50 +0300 |
commit | 8c660c780171fe6ddba78b611899fe99064d2a57 (patch) | |
tree | eabc6a0c7f86d001e8d2b4aa11fc268361c50376 /source/blender/blenkernel | |
parent | 61b77d8948303acb7d8dd038d25004c7774e0052 (diff) |
Cycles integration with Draw Manager
We can now use object and other modes on top of Cycles.
Since we are now always on "render_to_view" (old Rendered mode), the
pause button is always visible.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index bf5eaab6e3b..b963dbf89fa 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1418,13 +1418,19 @@ static bool check_rendered_viewport_visible(Main *bmain) wmWindow *window; for (window = wm->windows.first; window != NULL; window = window->next) { bScreen *screen = window->screen; + Scene *scene = screen->scene; ScrArea *area; + RenderEngineType *type = RE_engines_find(scene->r.engine); + if ((type->draw_engine != NULL) || (type->render_to_view == NULL)) { + continue; + } + const bool use_legacy = (type->flag & RE_USE_LEGACY_PIPELINE) != 0; for (area = screen->areabase.first; area != NULL; area = area->next) { View3D *v3d = area->spacedata.first; if (area->spacetype != SPACE_VIEW3D) { continue; } - if (v3d->drawtype == OB_RENDER) { + if (v3d->drawtype == OB_RENDER || !use_legacy) { return true; } } |