[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40908] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix #28857: 2.60 rc1 regression?

[Sergey Sharybin]

Revision: 40908
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40908
Author:   nazgul
Date:     2011-10-10 14:32:08 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Fix #28857: 2.60 rc1 regression?

If displacement mapping is used, normals 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-10 12:56:21 UTC (rev 40907)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-10-10 14:32:08 UTC (rev 40908)
@@ -12123,12 +12123,14 @@
 
 					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)) {
-								Tex *tex= newlibadr(fd, lib, mtex->tex);
+							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;
+									if(!tex || (tex->imaflag&TEX_NORMALMAP)==0) {
+										mtex->norfac= -mtex->norfac;
+										mtex->texflag|= MTEX_BUMP_FLIPPED;
+									}
 								}
 							}
 						}