From f021d97e8f3812ada6e1afa44557cb62c4df1f02 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 23 Nov 2015 17:24:49 +0500
Subject: Fix T46842: Removing World is missing AO update in viewport render

---
 intern/cycles/blender/blender_shader.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'intern/cycles/blender/blender_shader.cpp')

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 2beeaa5e07a..81204aaa13a 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);
-- 
cgit v1.2.3