sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code Cleanup / Cycles:

Browse Source 
* Remove an unused parameter from Checker texture and correct a typo in license header.
This commit is contained in:
Thomas Dinges 2013-05-20 00:26:48 +00:00
parent 51f04bf7b8
commit 289ca57e7a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/osl/osl_closures.cpp
View 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.

2
intern/cycles/kernel/svm/svm.h
View 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);

2
intern/cycles/kernel/svm/svm_checker.h
View 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;