[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42297] trunk/blender/source/blender: Remove MTEX_BUMP_FLIPPED flag which was added temporary when white/ black colors

[Sergey Sharybin]

Revision: 42297
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42297
Author:   nazgul
Date:     2011-11-30 16:26:30 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Remove MTEX_BUMP_FLIPPED flag which was added temporary when white/black colors
for bump maps were toggled.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/texture.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesdna/DNA_texture_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2011-11-30 15:10:44 UTC (rev 42296)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2011-11-30 16:26:30 UTC (rev 42297)
@@ -709,11 +709,7 @@
 	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;

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-11-30 15:10:44 UTC (rev 42296)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-11-30 16:26:30 UTC (rev 42297)
@@ -12427,34 +12427,6 @@
 					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){

Modified: trunk/blender/source/blender/makesdna/DNA_texture_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_texture_types.h	2011-11-30 15:10:44 UTC (rev 42296)
+++ trunk/blender/source/blender/makesdna/DNA_texture_types.h	2011-11-30 16:26:30 UTC (rev 42297)
@@ -492,7 +492,7 @@
 #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