Code Cleanup / Cycles:
authorThomas Dinges <blender@dingto.org>
Mon, 20 May 2013 00:26:48 +0000 (00:26 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 20 May 2013 00:26:48 +0000 (00:26 +0000)
* Remove an unused parameter from Checker texture and correct a typo in license header.

intern/cycles/kernel/osl/osl_closures.cpp
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_checker.h

index b477b18608051414ea40761d505d0b4897bce674..cc78c14ee853e5f34d39293e318ec8bfffa8427b 100644 (file)
@@ -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.
index 1f4857c092461411016379764252bae49c05b236..22172420aba999cb71cf3fa4802084c0859928b2 100644 (file)
@@ -273,7 +273,7 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT
                                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);
index bee0cc57689772faad7f3e247d141ca1e20b0624..c5db0383bc538b706075ee65feae8033c18aef59 100644 (file)
@@ -36,7 +36,7 @@ __device_noinline float svm_checker(float3 p, float scale)
        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;