[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40832] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix #28819: Normal Maps appear inverted in GLSL shader and offline renderer (2.6rc1)

[Sergey Sharybin]

Revision: 40832
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40832
Author:   nazgul
Date:     2011-10-06 14:55:30 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Fix #28819: Normal Maps appear inverted in GLSL shader and offline renderer (2.6rc1)

Caused by recent bump maps flip commit.
If texture is used as Normal Map it's normal factor shouldn't be flipped.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-10-06 12:51:33 UTC (rev 40831)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-10-06 14:55:30 UTC (rev 40832)
@@ -12122,8 +12122,12 @@
 					if(mtex) {
 						if((mtex->texflag&MTEX_BUMP_FLIPPED)==0) {
 							if((mtex->mapto&MAP_NORM) && mtex->texflag&(MTEX_COMPAT_BUMP|MTEX_3TAP_BUMP|MTEX_5TAP_BUMP)) {
-								mtex->norfac= -mtex->norfac;
-								mtex->texflag|= MTEX_BUMP_FLIPPED;
+								Tex *tex= newlibadr(fd, lib, mtex->tex);
+
+								if(!tex || (tex->imaflag&TEX_NORMALMAP)==0) {
+									mtex->norfac= -mtex->norfac;
+									mtex->texflag|= MTEX_BUMP_FLIPPED;
+								}
 							}
 						}
 					}