[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47434] trunk/blender/intern/cycles/kernel /kernel_shader.h: Cycles / OSL:

[Thomas Dinges]

Revision: 47434
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47434
Author:   dingto
Date:     2012-06-04 19:53:50 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
Cycles / OSL:
* Compile fixes, missing ShaderClosure argument for eval functions. (r40163)

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40163

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

Modified: trunk/blender/intern/cycles/kernel/kernel_shader.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_shader.h	2012-06-04 19:43:12 UTC (rev 47433)
+++ trunk/blender/intern/cycles/kernel/kernel_shader.h	2012-06-04 19:53:50 UTC (rev 47434)
@@ -520,7 +520,7 @@
 
 		if(CLOSURE_IS_EMISSION(sc->type)) {
 #ifdef __OSL__
-			eval += OSLShader::emissive_eval(sd)*sc->weight;
+			eval += OSLShader::emissive_eval(sd, sc)*sc->weight;
 #else
 			eval += svm_emissive_eval(sd, sc)*sc->weight;
 #endif
@@ -624,7 +624,7 @@
 
 		if(CLOSURE_IS_VOLUME(sc->type)) {
 #ifdef __OSL__
-			eval += OSLShader::volume_eval_phase(sd, omega_in, omega_out);
+			eval += OSLShader::volume_eval_phase(sd, sc, omega_in, omega_out);
 #else
 			eval += volume_eval_phase(sd, sc, omega_in, omega_out);
 #endif