[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50324] trunk/blender/intern/cycles/kernel /kernel_accumulate.h: Cycles compile fix: only use std:: isfinite when OSL is enabled.

[Lukas Toenne]

Revision: 50324
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50324
Author:   lukastoenne
Date:     2012-09-02 18:11:28 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
Cycles compile fix: only use std::isfinite when OSL is enabled.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_accumulate.h

Modified: trunk/blender/intern/cycles/kernel/kernel_accumulate.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_accumulate.h	2012-09-02 17:39:07 UTC (rev 50323)
+++ trunk/blender/intern/cycles/kernel/kernel_accumulate.h	2012-09-02 18:11:28 UTC (rev 50324)
@@ -301,9 +301,13 @@
 
 __device_inline void path_radiance_clamp(PathRadiance *L, float3 *L_sum, float clamp)
 {
+	#ifdef WITH_OSL
+	using std::isfinite;
+	#endif
+
 	float sum = fabsf((*L_sum).x) + fabsf((*L_sum).y) + fabsf((*L_sum).z);
 
-	if(!std::isfinite(sum)) {
+	if(!isfinite(sum)) {
 		/* invalid value, reject */
 		*L_sum = make_float3(0.0f, 0.0f, 0.0f);