Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-05-02 19:50:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-02 19:52:39 +0300
commit3f567535da163df7e77fe9438cc80fb8b2c67b87 (patch)
tree7b883ebf63eab2be1d0e34ae0fa434ff48a14a18 /source/blender/editors/space_view3d
parent2b0f02057f457acec1ed9444ee7d833ab26d0d33 (diff)
Draw Manager: OpenGL render support
Works for clay-engine but doesn't draw objects with eevee.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw_legacy.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 60b9cbb3b1c..66876efd3e9 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -107,6 +107,10 @@
#include "GPU_select.h"
#include "GPU_matrix.h"
+#include "RE_engine.h"
+
+#include "DRW_engine.h"
+
#include "view3d_intern.h" /* own include */
/* prototypes */
@@ -1811,7 +1815,14 @@ void ED_view3d_draw_offscreen(
}
/* main drawing call */
- view3d_draw_objects(NULL, scene, v3d, ar, NULL, do_bgpic, true, do_compositing ? fx : NULL);
+ RenderEngineType *type = RE_engines_find(scene->r.engine);
+ if (IS_VIEWPORT_LEGACY(v3d) && ((type->flag & RE_USE_LEGACY_PIPELINE) != 0)) {
+ view3d_draw_objects(NULL, scene, v3d, ar, NULL, do_bgpic, true, do_compositing ? fx : NULL);
+ }
+ else {
+ /* XXX, should take depsgraph as arg */
+ DRW_draw_render_loop_offscreen(scene->depsgraph, v3d, ar, ofs);
+ }
/* post process */
if (do_compositing) {