[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53042] trunk/blender/intern/cycles/kernel /kernel_shader.h: Fix cycles build error with OSL disabled.

[Brecht Van Lommel]

Revision: 53042
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53042
Author:   blendix
Date:     2012-12-15 20:43:25 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Fix cycles build error with OSL disabled.

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-12-15 20:32:32 UTC (rev 53041)
+++ trunk/blender/intern/cycles/kernel/kernel_shader.h	2012-12-15 20:43:25 UTC (rev 53042)
@@ -752,7 +752,11 @@
 		for(int j = i + 1; j < sd->num_closure; j++) {
 			ShaderClosure *scj = &sd->closure[j];
 
+#ifdef __OSL__
 			if(!sci->prim && sci->type == scj->type && sci->data0 == scj->data0 && sci->data1 == scj->data1) {
+#else
+			if(sci->type == scj->type && sci->data0 == scj->data0 && sci->data1 == scj->data1) {
+#endif
 				sci->weight += scj->weight;
 				sci->sample_weight += scj->sample_weight;