diff options
author | Thomas Dinges <blender@dingto.org> | 2013-05-20 04:26:48 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-05-20 04:26:48 +0400 |
commit | 289ca57e7ae26c153739b5d7411a6113e515d45c (patch) | |
tree | 3ec8f76a9a9b30e3931b90d1b092141403907f5c /intern | |
parent | 51f04bf7b8ee03a7973c50e525ffa5c67dde5fb7 (diff) |
Code Cleanup / Cycles:
* Remove an unused parameter from Checker texture and correct a typo in license header.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/osl/osl_closures.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_checker.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index b477b186080..cc78c14ee85 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -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. diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 1f4857c0924..22172420aba 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -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); diff --git a/intern/cycles/kernel/svm/svm_checker.h b/intern/cycles/kernel/svm/svm_checker.h index bee0cc57689..c5db0383bc5 100644 --- a/intern/cycles/kernel/svm/svm_checker.h +++ b/intern/cycles/kernel/svm/svm_checker.h @@ -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; |