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:
authorDaniel Genrich <daniel.genrich@gmx.net>2008-09-10 15:04:07 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2008-09-10 15:04:07 +0400
commit190aae27ae7149945f2bf802d7cfd7691f61c45f (patch)
tree7f64806cb35162dd12c6ed4f08309ef11771dbb1 /source/blender/makesdna/DNA_ipo_types.h
parentd2c13039ede9e50cf2aaf55651f66d4b730089af (diff)
parent75078d62df5ee8186369b5f1273b61b0736346ec (diff)
svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/DNA_ipo_types.h')
-rw-r--r--source/blender/makesdna/DNA_ipo_types.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 914b22b9ccc..f517bf14733 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -142,24 +142,24 @@ typedef short IPO_Channel;
#define MA_FRESTRAI 25
#define MA_ADD 26
-#define MA_MAP1 1<<5
-#define MA_MAP2 1<<6
-#define MA_MAP3 1<<7
-#define MA_MAP4 1<<8
-#define MA_MAP5 1<<9
-#define MA_MAP6 1<<10
-#define MA_MAP7 1<<11
-#define MA_MAP8 1<<12
-#define MA_MAP9 1<<13
-#define MA_MAP10 1<<14
-#define MA_MAP11 1<<15
-#define MA_MAP12 1<<16
-#define MA_MAP13 1<<17
-#define MA_MAP14 1<<18
-#define MA_MAP15 1<<19
-#define MA_MAP16 1<<20
-#define MA_MAP17 1<<21
-#define MA_MAP18 1<<22
+#define MA_MAP1 (1<<5)
+#define MA_MAP2 (1<<6)
+#define MA_MAP3 (1<<7)
+#define MA_MAP4 (1<<8)
+#define MA_MAP5 (1<<9)
+#define MA_MAP6 (1<<10)
+#define MA_MAP7 (1<<11)
+#define MA_MAP8 (1<<12)
+#define MA_MAP9 (1<<13)
+#define MA_MAP10 (1<<14)
+#define MA_MAP11 (1<<15)
+#define MA_MAP12 (1<<16)
+#define MA_MAP13 (1<<17)
+#define MA_MAP14 (1<<18)
+#define MA_MAP15 (1<<19)
+#define MA_MAP16 (1<<20)
+#define MA_MAP17 (1<<21)
+#define MA_MAP18 (1<<22)
#define TEX_TOTNAM 14