diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-30 20:26:30 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-30 20:26:30 +0400 |
| commit | af5adbad3f48f8ebbc73ecd31db9bcf74bd5a657 (patch) | |
| tree | 52e17af30b4531496d05f5135176a0c5938603a2 | |
| parent | 343c2bb5aa8cc9c72f94c59a8b4a3bd39a67b8ff (diff) | |
Remove MTEX_BUMP_FLIPPED flag which was added temporary when white/black colors
for bump maps were toggled.
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 28 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 2 |
3 files changed, 2 insertions, 34 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 13205326dd2..93404dc25fb 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -709,11 +709,7 @@ void default_mtex(MTex *mtex) mtex->size[1]= 1.0; mtex->size[2]= 1.0; mtex->tex= NULL; - - /* MTEX_BUMP_FLIPPED is temporary before 2.61 release to prevent flipping normals - when creating file in 2.60, opening it in 2.59, saving and opening in 2.60 again */ - mtex->texflag= MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE | MTEX_BUMP_FLIPPED; - + mtex->texflag= MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE; mtex->colormodel= 0; mtex->r= 1.0; mtex->g= 0.0; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 7ebdff546e2..7b3066043fb 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -12427,34 +12427,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) sce->gm.recastData.detailsamplemaxerror = 1.0f; } } - - { - /* flip normals */ - Material *ma= main->mat.first; - while(ma) { - int a; - for(a= 0; a<MAX_MTEX; a++) { - MTex *mtex= ma->mtex[a]; - - if(mtex) { - if((mtex->texflag&MTEX_BUMP_FLIPPED)==0) { - if((mtex->mapto&MAP_DISPLACE)==0) { - if((mtex->mapto&MAP_NORM) && mtex->texflag&(MTEX_COMPAT_BUMP|MTEX_3TAP_BUMP|MTEX_5TAP_BUMP)) { - Tex *tex= newlibadr(fd, lib, mtex->tex); - - if(!tex || (tex->imaflag&TEX_NORMALMAP)==0) { - mtex->norfac= -mtex->norfac; - mtex->texflag|= MTEX_BUMP_FLIPPED; - } - } - } - } - } - } - - ma= ma->id.next; - } - } } if (main->versionfile < 260){ 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 |