sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #28857: 2.60 rc1 regression?

Browse Source 
If displacement mapping is used, normals shouldn't be flipped.
This commit is contained in:
Sergey Sharybin 2011-10-10 14:32:08 +00:00
parent 90b3bd84da
commit 21a755b4f5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenloader/intern/readfile.c
View File

@ -12123,12 +12123,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if(mtex) { if(mtex) {
if((mtex->texflag&MTEX_BUMP_FLIPPED)==0) { if((mtex->texflag&MTEX_BUMP_FLIPPED)==0) {
if((mtex->mapto&MAP_NORM) && mtex->texflag&(MTEX_COMPAT_BUMP|MTEX_3TAP_BUMP|MTEX_5TAP_BUMP)) { if((mtex->mapto&MAP_DISPLACE)==0) {
Tex *tex= newlibadr(fd, lib, mtex->tex); 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) { if(!tex || (tex->imaflag&TEX_NORMALMAP)==0) {
mtex->norfac= -mtex->norfac; mtex->norfac= -mtex->norfac;
mtex->texflag|= MTEX_BUMP_FLIPPED; mtex->texflag|= MTEX_BUMP_FLIPPED;
}
} }
} }
} }