diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-07-20 02:02:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-07-20 02:02:22 +0400 |
| commit | 6e0d977977d13ff0379c1bc60606f34985db1f59 (patch) | |
| tree | 9adb88ef666535a273498b38d6bfc0a7e0464d0e /source/blender/render | |
| parent | a114f8f17a8b8ce52990b307f151a083fc5cc9ce (diff) | |
Use texture constants in the interface and added some missing texture constants.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/texture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 59d134f2665..814309e9e31 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -200,7 +200,7 @@ static int blend(Tex *tex, float *texvec, TexResult *texres) else { /* sphere TEX_SPHERE */ texres->tin= 1.0-sqrt(x*x+ y*y+texvec[2]*texvec[2]); if(texres->tin<0.0) texres->tin= 0.0; - if(tex->stype==5) texres->tin*= texres->tin; /* halo */ + if(tex->stype==TEX_HALO) texres->tin*= texres->tin; /* halo */ } BRICONT; @@ -229,7 +229,7 @@ static int clouds(Tex *tex, float *texvec, TexResult *texres) rv |= TEX_NOR; } - if (tex->stype==1) { + if (tex->stype==TEX_COLOR) { // in this case, int. value should really be computed from color, // and bumpnormal from that, would be too slow, looks ok as is texres->tr = texres->tin; @@ -480,7 +480,7 @@ static int stucci(Tex *tex, float *texvec, TexResult *texres) VECCOPY(texres->nor, nor); tex_normal_derivate(tex, texres); - if(tex->stype==2) { + if(tex->stype==TEX_WALLOUT) { texres->nor[0]= -texres->nor[0]; texres->nor[1]= -texres->nor[1]; texres->nor[2]= -texres->nor[2]; @@ -489,7 +489,7 @@ static int stucci(Tex *tex, float *texvec, TexResult *texres) retval |= TEX_NOR; } - if(tex->stype==2) + if(tex->stype==TEX_WALLOUT) texres->tin= 1.0f-texres->tin; if(texres->tin<0.0f) |