diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2020-01-14 21:43:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2020-01-14 21:43:46 +0300 |
| commit | 468fad3ac73c4db21f5efda90ac250d089245f20 (patch) | |
| tree | 66e772b1a3e87493ab1e67e7777c6cc97d5612bb /source/blender/makesdna | |
| parent | f8b34d5ca45d9a35bec1c93717cac43f422c9877 (diff) | |
| parent | eb9401e9aff86dcaf0a1120260c974d5f489104a (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index ead1bcc943d..3d3d215b973 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -406,8 +406,8 @@ typedef struct ColorMapping { /* return value */ #define TEX_INT 0 -#define TEX_RGB 1 -#define TEX_NOR 2 +#define TEX_RGB (1 << 0) +#define TEX_NOR (1 << 1) /* pr_texture in material, world, light. */ #define TEX_PR_TEXTURE 0 |