forked from bartvdbraak/blender
Fix #28857: 2.60 rc1 regression?
If displacement mapping is used, normals shouldn't be flipped.
This commit is contained in:
parent
90b3bd84da
commit
21a755b4f5
@ -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->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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user