diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-10-06 18:55:30 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-10-06 18:55:30 +0400 |
| commit | b87161811621c38961bd14d2cf04d84f407a64bd (patch) | |
| tree | 313ba5af9a78985931dcd9d87586f2f3de2e7868 /source/blender/blenloader | |
| parent | 839cc868720f3e9054c9bd12b4823881c82babb7 (diff) | |
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.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 95bf44d884c..ce5805921dc 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -12122,8 +12122,12 @@ 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)) { - 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; + } } } } |