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:
authorCampbell Barton <ideasman42@gmail.com>2019-01-29 00:52:56 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-29 01:11:05 +0300
commit957b4547aeebc8c5a438ea507e8033cb563b7f40 (patch)
treee491f93bf4cf8da7e96efa6209dbc89930958b55 /source/blender/makesdna/DNA_texture_types.h
parent097b1cd08a551c22df86c38c8d8380b87c88e81d (diff)
Cleanup: Remove unused MTex.texflag
Diffstat (limited to 'source/blender/makesdna/DNA_texture_types.h')
-rw-r--r--source/blender/makesdna/DNA_texture_types.h21
1 files changed, 2 insertions, 19 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 418f53edb9e..59047a00321 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -65,7 +65,8 @@ typedef struct MTex {
char pad[2];
float ofs[3], size[3], rot, random_angle;
- short texflag, colormodel, pmapto, pmaptoneg;
+ char _pad0[2];
+ short colormodel, pmapto, pmaptoneg;
short normapspace, which_output;
float r, g, b, k;
float def_var, rt;
@@ -427,24 +428,6 @@ typedef struct ColorMapping {
#define PROJ_Y 2
#define PROJ_Z 3
-/* texflag */
-#define MTEX_RGBTOINT (1 << 0)
-#define MTEX_STENCIL (1 << 1)
-#define MTEX_NEGATIVE (1 << 2)
-#define MTEX_ALPHAMIX (1 << 3)
-#define MTEX_VIEWSPACE (1 << 4)
-#define MTEX_DUPLI_MAPTO (1 << 5)
-#define MTEX_OB_DUPLI_ORIG (1 << 6)
-#define MTEX_COMPAT_BUMP (1 << 7)
-#define MTEX_3TAP_BUMP (1 << 8)
-#define MTEX_5TAP_BUMP (1 << 9)
-#define MTEX_BUMP_OBJECTSPACE (1 << 10)
-#define MTEX_BUMP_TEXTURESPACE (1 << 11)
-/* #define MTEX_BUMP_FLIPPED (1 << 12) */ /* UNUSED */
-#define MTEX_TIPS (1 << 12) /* should use with_freestyle flag? */
-#define MTEX_BICUBIC_BUMP (1 << 13)
-#define MTEX_MAPTO_BOUNDS (1 << 14)
-
/* blendtype */
#define MTEX_BLEND 0
#define MTEX_MUL 1