Cycles: use AO factor to let user adjust intensity of AO bounces.

We are already using the AO distance, so might as well offer this extra
control over the intensity. Useful when an interior scene is supposed to
be significantly darker than the background shader.

2 files changed, 4 insertions, 8 deletions

diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp
index 930debe1e33..3ed96732b14 100644
--- a/intern/cycles/render/background.cpp
+++ b/intern/cycles/render/background.cpp
@@ -74,14 +74,9 @@ void Background::device_update(Device *device, DeviceScene *dscene, Scene *scene
 	/* set shader index and transparent option */
 	KernelBackground *kbackground = &dscene->data.background;
 
-	if(use_ao) {
-		kbackground->ao_factor = ao_factor;
-		kbackground->ao_distance = ao_distance;
-	}
-	else {
-		kbackground->ao_factor = 0.0f;
-		kbackground->ao_distance = FLT_MAX;
-	}
+	kbackground->ao_factor = (use_ao)? ao_factor: 0.0f;
+	kbackground->ao_bounces_factor = ao_factor;
+	kbackground->ao_distance = ao_distance;
 
 	kbackground->transparent = transparent;
 	kbackground->surface_shader = scene->shader_manager->get_shader_id(bg_shader);
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index 33c3dac9e81..0dc1a9aa053 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "device/device.h"
+#include "render/background.h"
 #include "render/integrator.h"
 #include "render/film.h"
 #include "render/light.h"