[Bf-blender-cvs] [fa76c696274] blender2.8: Draw Manager: support render only mode.

[Clément Foucault]

Commit: fa76c6962746355be53b1ea110e2763416b23d27
Author: Clément Foucault
Date:   Tue May 16 20:19:49 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBfa76c6962746355be53b1ea110e2763416b23d27

Draw Manager: support render only mode.

===================================================================

M	source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 5a1c05e3835..d74ea4fed94 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2533,12 +2533,14 @@ static void DRW_engines_enable_external(void)
 	use_drw_engine(DRW_engine_viewport_external_type.draw_engine);
 }
 
-static void DRW_engines_enable(const Scene *scene, SceneLayer *sl)
+static void DRW_engines_enable(const Scene *scene, SceneLayer *sl, const View3D *v3d)
 {
 	const int mode = CTX_data_mode_enum_ex(scene->obedit, OBACT_NEW);
 	DRW_engines_enable_from_engine(scene);
-	DRW_engines_enable_from_object_mode();
-	DRW_engines_enable_from_mode(mode);
+	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+		DRW_engines_enable_from_object_mode();
+		DRW_engines_enable_from_mode(mode);
+	}
 }
 
 static void DRW_engines_disable(void)
@@ -2751,7 +2753,7 @@ void DRW_draw_render_loop(
 	v3d->zbuf = true;
 
 	/* Get list of enabled engines */
-	DRW_engines_enable(scene, sl);
+	DRW_engines_enable(scene, sl, v3d);
 
 	/* Setup viewport */
 	cache_is_dirty = GPU_viewport_cache_validate(DST.viewport, DRW_engines_get_hash());