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/editors/space_view3d | |
| 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/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 08b15957dbb..7e2789de33d 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2413,7 +2413,7 @@ void view3d_main_region_draw(const bContext *C, ARegion *ar) /* TODO layers - In the future we should get RE from Layers */ RenderEngineType *type = RE_engines_find(scene->r.engine); - if (IS_VIEWPORT_LEGACY(v3d) && ((type->flag & RE_USE_OGL_PIPELINE) == 0)) { + if (IS_VIEWPORT_LEGACY(v3d) && ((type->flag & RE_USE_LEGACY_PIPELINE) != 0)) { view3d_main_region_draw_legacy(C, ar); return; } @@ -2429,10 +2429,12 @@ void view3d_main_region_draw(const bContext *C, ARegion *ar) GPU_viewport_bind(rv3d->viewport, &ar->winrct); - if (type->flag & RE_USE_OGL_PIPELINE) + if ((type->flag & RE_USE_LEGACY_PIPELINE) == 0) { view3d_draw_view_new(C, ar, &draw_data); - else + } + else { view3d_draw_view(C, ar, &draw_data); + } GPU_viewport_unbind(rv3d->viewport); |