Fix #28857: 2.60 rc1 regression?

[blender.git] / source / blender / blenloader / intern / readfile.c

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9ba539acb1665eb11988d3072c1d510d6f926994..38b4a77365086180885edd2ca49ed8ef8239809a 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -12123,12 +12123,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
                                        if(mtex) {
                                                if((mtex->texflag&MTEX_BUMP_FLIPPED)==0) {
 
                                        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;
+                                                                       }

                                                                }
                                                        }
                                                }
                                                                }
                                                        }
                                                }