[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59788] trunk/blender/intern/cycles/kernel : Fix cycles CUDA/OpenCL build error after recent change.

[Brecht Van Lommel]

Revision: 59788
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59788
Author:   blendix
Date:     2013-09-04 01:04:14 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
Fix cycles CUDA/OpenCL build error after recent change.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/closure/bsdf.h
    trunk/blender/intern/cycles/kernel/kernel_subsurface.h

Modified: trunk/blender/intern/cycles/kernel/closure/bsdf.h
===================================================================
--- trunk/blender/intern/cycles/kernel/closure/bsdf.h	2013-09-04 00:21:27 UTC (rev 59787)
+++ trunk/blender/intern/cycles/kernel/closure/bsdf.h	2013-09-04 01:04:14 UTC (rev 59788)
@@ -28,7 +28,9 @@
 #endif
 #include "../closure/bsdf_westin.h"
 #include "../closure/bsdf_toon.h"
+#ifdef __SUBSURFACE__
 #include "../closure/bssrdf.h"
+#endif
 
 CCL_NAMESPACE_BEGIN
 

Modified: trunk/blender/intern/cycles/kernel/kernel_subsurface.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_subsurface.h	2013-09-04 00:21:27 UTC (rev 59787)
+++ trunk/blender/intern/cycles/kernel/kernel_subsurface.h	2013-09-04 01:04:14 UTC (rev 59788)
@@ -16,15 +16,11 @@
 
 CCL_NAMESPACE_BEGIN
 
-#include "closure/bssrdf.h"
-
 /* NEW BSSRDF: See "BSSRDF Importance Sampling", SIGGRAPH 2013 */
 
 /* TODO:
  * - test using power heuristic for combing bssrdfs
  * - try to reduce one sample model variance
- * - possible shade all hits for progressive integrator
- * - cubic and gaussian scale difference tweak
  */
 
 #define BSSRDF_MULTI_EVAL