Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2020-01-14 21:38:28 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2020-01-14 21:43:00 +0300
commiteb9401e9aff86dcaf0a1120260c974d5f489104a (patch)
tree2ffc409a3ef25b17188ea3b2d027b489bd2cc1d9 /source/blender/render
parente2724abc22d53f3a1f1552a6f40af3d47f7512e4 (diff)
Cleanup: get rid of magic values for return flags of texture value getters.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/imagetexture.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c
index 47d0986fabd..253741401f1 100644
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/source/imagetexture.c
@@ -112,7 +112,7 @@ int imagewrap(Tex *tex,
texres->tin = texres->ta = texres->tr = texres->tg = texres->tb = 0.0f;
/* we need to set retval OK, otherwise texture code generates normals itself... */
- retval = texres->nor ? 3 : 1;
+ retval = texres->nor ? (TEX_RGB | TEX_NOR) : TEX_RGB;
/* quick tests */
if (ima == NULL) {
@@ -1035,7 +1035,7 @@ static int imagewraposa_aniso(Tex *tex,
texres->tin = texres->ta = texres->tr = texres->tg = texres->tb = 0.f;
/* we need to set retval OK, otherwise texture code generates normals itself... */
- retval = texres->nor ? 3 : 1;
+ retval = texres->nor ? (TEX_RGB | TEX_NOR) : TEX_RGB;
/* quick tests */
if (ibuf == NULL && ima == NULL) {
@@ -1492,7 +1492,7 @@ int imagewraposa(Tex *tex,
texres->tin = texres->ta = texres->tr = texres->tg = texres->tb = 0.0f;
/* we need to set retval OK, otherwise texture code generates normals itself... */
- retval = texres->nor ? 3 : 1;
+ retval = texres->nor ? (TEX_RGB | TEX_NOR) : TEX_RGB;
/* quick tests */
if (ibuf == NULL && ima == NULL) {