svn merge ^/trunk/blender -r43092:43092

2012-01-04 06:20:10 +00:00
parent 8d8403c15e 434c1e6df8
commit d0cdefd9fa
15 changed files with 126 additions and 287 deletions
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -1120,7 +1120,11 @@ static void do_material_tex(GPUShadeInput *shi)
 						// to inverting the bump map. Should this ever change
 						// this negate must be removed.
 						norfac = -hScale * mtex->norfac;
-						if(found_deriv_map) norfac /= sqrtf(ima_x*ima_y);
+						if(found_deriv_map)
+						{
+							float fVirtDim = sqrtf(fabsf(ima_x*mtex->size[0]*ima_y*mtex->size[1]));
+							norfac /= MAX2(fVirtDim, FLT_EPSILON);
+						}

 						tnorfac = GPU_uniform(&norfac);