[Bf-blender-cvs] [181c8f8ccd9] blender2.8: Draw Manager: Fix Background sets not being drawn.

[Clément Foucault]

Commit: 181c8f8ccd9f2ec102d3b78a18a809e320467aa2
Author: Clément Foucault
Date:   Tue Apr 11 16:11:45 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB181c8f8ccd9f2ec102d3b78a18a809e320467aa2

Draw Manager: Fix Background sets not being drawn.

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

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 1260decb071..a2f25f604a4 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1797,14 +1797,29 @@ void DRW_draw_view(const bContext *C)
 	/* ideally only refresh when objects are added/removed */
 	/* or render properties / materials change */
 	if (cache_is_dirty) {
-		SceneLayer *sl = CTX_data_scene_layer(C);
+		SceneLayer *sl;
+		Scene *scene = CTX_data_scene(C);
 
 		DRW_engines_cache_init();
+
+		/* draw set first */
+		if (scene->set) {
+			sl = BKE_scene_layer_render_active(scene->set);
+			DEG_OBJECT_ITER(sl, ob);
+			{
+				ob->base_flag &= ~BASE_SELECTED;
+				DRW_engines_cache_populate(ob);
+			}
+			DEG_OBJECT_ITER_END
+		}
+
+		sl = CTX_data_scene_layer(C);
 		DEG_OBJECT_ITER(sl, ob);
 		{
 			DRW_engines_cache_populate(ob);
 		}
 		DEG_OBJECT_ITER_END
+
 		DRW_engines_cache_finish();
 	}