Cycles: add render layer use environment option to disable world lighting on

individual render layers.

1 files changed, 7 insertions, 1 deletions

diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp
index 919bd83f195..76d26dd34b5 100644
--- a/intern/cycles/render/background.cpp
+++ b/intern/cycles/render/background.cpp
@@ -35,6 +35,8 @@ Background::Background()
 	ao_factor = 0.0f;
 	ao_distance = FLT_MAX;
 
+	use = true;
+
 	transparent = false;
 	need_update = true;
 }
@@ -57,7 +59,10 @@ void Background::device_update(Device *device, DeviceScene *dscene, Scene *scene
 	kbackground->ao_distance = ao_distance;
 
 	kbackground->transparent = transparent;
-	kbackground->shader = scene->shader_manager->get_shader_id(scene->default_background);
+	if(use)
+		kbackground->shader = scene->shader_manager->get_shader_id(scene->default_background);
+	else
+		kbackground->shader = scene->shader_manager->get_shader_id(scene->default_empty);
 
 	need_update = false;
 }
@@ -69,6 +74,7 @@ void Background::device_free(Device *device, DeviceScene *dscene)
 bool Background::modified(const Background& background)
 {
 	return !(transparent == background.transparent &&
+		use == background.use &&
 		ao_factor == background.ao_factor &&
 		ao_distance == background.ao_distance);
 }