[Bf-blender-cvs] [f021d97] master: Fix T46842: Removing World is missing AO update in viewport render

[Sergey Sharybin]

Commit: f021d97e8f3812ada6e1afa44557cb62c4df1f02
Author: Sergey Sharybin
Date:   Mon Nov 23 17:24:49 2015 +0500
Branches: master
https://developer.blender.org/rBf021d97e8f3812ada6e1afa44557cb62c4df1f02

Fix T46842: Removing World is missing AO update in viewport render

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

M	intern/cycles/blender/blender_shader.cpp

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

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 2beeaa5..81204aa 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -1167,6 +1167,10 @@ void BlenderSync::sync_world(bool update_all)
 
 			background->visibility = visibility;
 		}
+		else {
+			background->ao_factor = 0.0f;
+			background->ao_distance = FLT_MAX;
+		}
 
 		shader->set_graph(graph);
 		shader->tag_update(scene);