diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-01 21:11:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-01 21:11:09 +0300 |
| commit | 1b30b13a4d505ec293d1a7872c53a4bc735db92f (patch) | |
| tree | fe44f30726e9d0b0e6e9e5c70717440b6a9175a1 /source/blender/gpu | |
| parent | a3300bcac8f9658f1cac099d5d1520de6f2abc29 (diff) | |
Fix #21227, #21346 and #21336: image texture wasn't centered correctly
when sculpting and using it from material nodes.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 0d2b6747f79..03afa0b1b5a 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -1026,9 +1026,7 @@ static void do_material_tex(GPUShadeInput *shi) if(!(mat->scene->gm.flag & GAME_GLSL_NO_EXTRA_TEX) && (mtex->mapto & MAP_NORM)) { if((tex->type==TEX_IMAGE) && (tex->imaflag & TEX_NORMALMAP)) { - tex->norfac = mtex->norfac; - - if(tex->norfac < 0.0f) + if(mtex->norfac < 0.0f) GPU_link(mat, "mtex_negate_texnormal", tnor, &tnor); if(mtex->normapspace == MTEX_NSPACE_TANGENT) |