[Bf-blender-cvs] [df1af9b3493] blender-v2.79a-release: Fix Cycles bug in RR termination, probability should never be > 1.0.

[Brecht Van Lommel]

Commit: df1af9b3493b21c119bcb00da738e041979c3eb3
Author: Brecht Van Lommel
Date:   Tue Sep 12 02:27:02 2017 +0200
Branches: blender-v2.79a-release
https://developer.blender.org/rBdf1af9b3493b21c119bcb00da738e041979c3eb3

Fix Cycles bug in RR termination, probability should never be > 1.0.

This causes render differences in some scenes, for example fishy_cat
and pabellon scenes render brighter in a few spots. This is an old
bug, not due to recent RR changes.

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

M	intern/cycles/kernel/kernel_path_state.h

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

diff --git a/intern/cycles/kernel/kernel_path_state.h b/intern/cycles/kernel/kernel_path_state.h
index 5d92fd12201..b9d7feec704 100644
--- a/intern/cycles/kernel/kernel_path_state.h
+++ b/intern/cycles/kernel/kernel_path_state.h
@@ -187,7 +187,7 @@ ccl_device_inline float path_state_terminate_probability(KernelGlobals *kg, ccl_
 	}
 
 	/* probalistic termination */
-	return average(throughput); /* todo: try using max here */
+	return min(average(throughput), 1.0f); /* todo: try using max here */
 }
 
 /* TODO(DingTo): Find more meaningful name for this */