[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50430] trunk/blender/intern/cycles/kernel /kernel_accumulate.h: Quick fix for compiler error.

Lukas Toenne lukas.toenne at googlemail.com
Wed Sep 5 20:12:17 CEST 2012


Revision: 50430
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50430
Author:   lukastoenne
Date:     2012-09-05 18:12:17 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
Quick fix for compiler error. Somehow the isfinite symbol got lost for SVM too now, no idea how this happened or where it actually came from. This will likely also cause trouble with CUDA/OpenCL compilers, will have to be fixed properly later.

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-05 17:41:54 UTC (rev 50429)
+++ trunk/blender/intern/cycles/kernel/kernel_accumulate.h	2012-09-05 18:12:17 UTC (rev 50430)
@@ -301,9 +301,7 @@
 
 __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);
 




More information about the Bf-blender-cvs mailing list