[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56922] trunk/blender/intern/cycles/kernel : Code Cleanup / Cycles:

[Thomas Dinges]

Revision: 56922
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56922
Author:   dingto
Date:     2013-05-20 00:26:48 +0000 (Mon, 20 May 2013)
Log Message:
-----------
Code Cleanup / Cycles:
* Remove an unused parameter from Checker texture and correct a typo in license header. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp
    trunk/blender/intern/cycles/kernel/svm/svm.h
    trunk/blender/intern/cycles/kernel/svm/svm_checker.h

Modified: trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp	2013-05-19 18:05:34 UTC (rev 56921)
+++ trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp	2013-05-20 00:26:48 UTC (rev 56922)
@@ -1,7 +1,7 @@
 /*
  * Adapted from Open Shading Language with this license:
  *
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., closure_et al.
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
  * All Rights Reserved.
  *
  * Modifications Copyright 2011, Blender Foundation.

Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h	2013-05-19 18:05:34 UTC (rev 56921)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h	2013-05-20 00:26:48 UTC (rev 56922)
@@ -273,7 +273,7 @@
 				svm_node_tex_magic(kg, sd, stack, node, &offset);
 				break;
 			case NODE_TEX_CHECKER:
-				svm_node_tex_checker(kg, sd, stack, node, &offset);
+				svm_node_tex_checker(kg, sd, stack, node);
 				break;
 			case NODE_TEX_BRICK:
 				svm_node_tex_brick(kg, sd, stack, node, &offset);

Modified: trunk/blender/intern/cycles/kernel/svm/svm_checker.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_checker.h	2013-05-19 18:05:34 UTC (rev 56921)
+++ trunk/blender/intern/cycles/kernel/svm/svm_checker.h	2013-05-20 00:26:48 UTC (rev 56922)
@@ -36,7 +36,7 @@
 	return ((xi % 2 == yi % 2) == (zi % 2))? 1.0f: 0.0f;
 }
 
-__device void svm_node_tex_checker(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
+__device void svm_node_tex_checker(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node)
 {	
 	uint co_offset, color1_offset, color2_offset, scale_offset;
 	uint color_offset, fac_offset;