diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 21:59:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 21:59:30 +0400 |
| commit | 51488283564273c5e796d5ca3ded47f2726330e8 (patch) | |
| tree | a6149b89048c7827e7f762e469050dd8d94e7d50 /source/blender/gpu/intern | |
| parent | 85d99737b5753fd845c3fce0f08e6b5205530195 (diff) | |
| parent | 5cd85ed57ea649c58c7c19d709bfc4cae7fffcad (diff) | |
svn merge ^/trunk/blender -r44235:44250
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index ef2abb20cf3..0ddaf07c67e 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -1071,7 +1071,7 @@ static void do_material_tex(GPUShadeInput *shi) else newnor = tnor; - norfac = MIN2(fabsf(mtex->norfac), 1.0f); + norfac = minf(fabsf(mtex->norfac), 1.0f); if(norfac == 1.0f && !GPU_link_changed(stencil)) { shi->vn = newnor; |