Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / Textures:

Browse Source 
* Some code cleanup, removed old enums, which are not used anymore. 
* Some renaming for consistency and to match new texture names.
This commit is contained in:
Thomas Dinges
2012-06-08 19:57:25 +00:00
parent 3d740121ed
commit 7c87f646c2
4 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/svm/svm_wave.h
View File

@@ -18,9 +18,9 @@
CCL_NAMESPACE_BEGIN
/* Marble */
/* Wave */
__device_noinline float svm_wave(NodeWoodType type, float3 p, float scale, float detail, float distortion, float dscale)
__device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float detail, float distortion, float dscale)
{
float w, n;
@@ -55,7 +55,7 @@ __device void svm_node_tex_wave(KernelGlobals *kg, ShaderData *sd, float *stack,
float distortion = stack_load_float_default(stack, distortion_offset, node2.z);
float dscale = stack_load_float_default(stack, dscale_offset, node2.w);
float f = svm_wave((NodeWoodType)type, co, scale, detail, distortion, dscale);
float f = svm_wave((NodeWaveType)type, co, scale, detail, distortion, dscale);
if(stack_valid(fac_offset)) stack_store_float(stack, fac_offset, f);
if(stack_valid(color_offset)) stack_store_float3(stack, color_offset, make_float3(f, f, f));