Merge branch 'master' into blender2.8

2018-06-19 16:21:35 +02:00 · 2018-06-19 16:21:35 +02:00 · a7e66d89d0
parent 86c1cad1cf 668f39519c
commit a7e66d89d0
1 changed files with 1 additions and 1 deletions
--- a/intern/cycles/kernel/svm/svm_ao.h
+++ b/intern/cycles/kernel/svm/svm_ao.h
@ -30,7 +30,7 @@ ccl_device_noinline float svm_ao(KernelGlobals *kg,

 	/* Early out if no sampling needed. */
 	if(max_dist <= 0.0f || num_samples < 1 || sd->object == OBJECT_NONE) {
-		return 0.0f;
+		return 1.0f;
 	}

 	if(flags & NODE_AO_INSIDE) {