diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-02 23:40:20 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-02 23:40:20 +0400 |
| commit | b7aefff198fddd8df0ca9149ec7cdcbb1034fa54 (patch) | |
| tree | a0bce7de801ca4534314d675eef89cd4d6ab2acc /source/blender/makesdna | |
| parent | 48c5820049ecd26cd315478c50cc53855c78a61f (diff) | |
| parent | 069f46ac89871ab5df5fce83230ff6a5ba0e5bc9 (diff) | |
Merging r42193 through r42349 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 5 |
5 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index be7b985412f..b6fc8106ba0 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -200,8 +200,8 @@ typedef struct MRecast{ /* reserve 16 for ME_HIDE */ #define ME_EDGERENDER (1<<5) #define ME_LOOSEEDGE (1<<7) -#define ME_SEAM_LAST (1<<8) -#define ME_SHARP (1<<9) +/* #define ME_SEAM_LAST (1<<8) */ /* UNUSED */ +#define ME_SHARP (1<<9) /* only reason this flag remains a 'short' */ /* puno = vertexnormal (mface) */ /* render assumes flips to be ordered like this */ diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 619df428f7c..6a4a9970b40 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -492,7 +492,7 @@ typedef struct ColorMapping { #define MTEX_5TAP_BUMP 512 #define MTEX_BUMP_OBJECTSPACE 1024 #define MTEX_BUMP_TEXTURESPACE 2048 -#define MTEX_BUMP_FLIPPED 4096 /* temp flag for 2.59/2.60 */ +/* #define MTEX_BUMP_FLIPPED 4096 */ /* UNUSED */ /* blendtype */ #define MTEX_BLEND 0 diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 93f4b209712..50136fdcc99 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -308,6 +308,7 @@ typedef struct View3D { /* may want to use 1 for select ?*/ #define V3D_BGPIC_EXPANDED 2 #define V3D_BGPIC_CAMERACLIP 4 +#define V3D_BGPIC_DISABLED 8 /* BGPic->source */ /* may want to use 1 for select ?*/ diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 2186a067c10..0dba78ff97e 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -804,7 +804,6 @@ static int elem_strcmp(const char *name, const char *oname) if(name[a]==0) break; a++; } - if(name[a] != oname[a]) return 1; return 0; } diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 64893420db4..b9bd2c073bf 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -309,8 +309,9 @@ static int add_name(const char *str) if (debugSDNA > 3) printf("seen %c ( %d) \n", str[j], str[j]); j++; } - if (debugSDNA > 3) printf("seen %c ( %d) \n", str[j], str[j]); - if (debugSDNA > 3) printf("special after offset %d\n", j); + if (debugSDNA > 3) printf("seen %c ( %d) \n" + "special after offset%d\n", + str[j], str[j], j); if (!isfuncptr) { /* multidimensional array pointer case */ |