[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56904] trunk/blender/intern/cycles/kernel /osl/osl_services.cpp: Cycles:

Thomas Dinges blender at dingto.org
Sun May 19 00:40:22 CEST 2013


Revision: 56904
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56904
Author:   dingto
Date:     2013-05-18 22:40:21 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Cycles:
* Fix OSL compilation for scene_intersect(), when __Hair__ was disabled. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_services.cpp

Modified: trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_services.cpp	2013-05-18 19:18:55 UTC (rev 56903)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.cpp	2013-05-18 22:40:21 UTC (rev 56904)
@@ -865,7 +865,11 @@
 	tracedata->init = true;
 
 	/* raytrace */
+#ifdef __HAIR__
 	return scene_intersect(sd->osl_globals, &ray, ~0, &tracedata->isect, NULL, 0.0f, 0.0f);
+#else
+	return scene_intersect(sd->osl_globals, &ray, ~0, &tracedata->isect);
+#endif
 }
 
 




More information about the Bf-blender-cvs mailing list