Ambient Occlusion split up into:

Ambient occlusion: multiplied with direct lighting by default, add
is also still available and more blending methods might be added if
they are useful. This is fundamentally a non physical effect.

Environment lighting: always added as you would expect (though you can
subtract by specifying negative energy). This can be just white or take
colors or textures from the world.

Indirect lighting: only supported for AAO at the moment (and is still
too approximate), and also is always added. A factor is available to
specify how much is added, though value 1.0 is correct.

Also:
* Material ambient value now defaults to 1.0.
* Added Environment, Indirect and Emit pass.
* "Both" blending method is no longer available.
* Attenuation, sampling parameters are still shared, some could be split
  up, though if they are different this would affect performance.

1 files changed, 7 insertions, 4 deletions

diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 9b3f78caee0..b79bc766d17 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -107,7 +107,7 @@ typedef struct World {
 	short aomode, aosamp, aomix, aocolor;
 	float ao_adapt_thresh, ao_adapt_speed_fac;
 	float ao_approx_error, ao_approx_correction;
-	float ao_indirect_energy;
+	float ao_indirect_energy, ao_env_energy, ao_pad2;
 	short ao_indirect_bounces, ao_pad;
 	short ao_samp_method, ao_gather_method, ao_approx_passes;
 	
@@ -142,13 +142,16 @@ typedef struct World {
 #define WO_STARS               2
 #define WO_DOF                 4
 #define WO_ACTIVITY_CULLING	   8
-#define WO_AMB_OCC	   		  16
+#define WO_ENV_LIGHT   		  16
 #define WO_DBVT_CULLING		  32
+#define WO_AMB_OCC   		  64
+#define WO_INDIRECT_LIGHT	  128
 
 /* aomix */
 #define WO_AOADD	0
-#define WO_AOSUB	1
-#define WO_AOADDSUB	2
+#define WO_AOSUB	1 /* deprecated */
+#define WO_AOADDSUB	2 /* deprecated */
+#define WO_AOMUL	3
 
 /* ao_samp_method - methods for sampling the AO hemi */
 #define WO_AOSAMP_CONSTANT			0