[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43107] trunk/blender/source/blender: calculate factor before using MAX2 macro
Morten Mikkelsen
mikkelsen7 at gmail.com
Tue Jan 3 23:18:53 CET 2012
Revision: 43107
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43107
Author: mmikkelsen
Date: 2012-01-03 22:18:52 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
calculate factor before using MAX2 macro
Modified Paths:
--------------
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/render/intern/source/render_texture.c
Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_material.c 2012-01-03 22:09:22 UTC (rev 43106)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c 2012-01-03 22:18:52 UTC (rev 43107)
@@ -1120,7 +1120,11 @@
// to inverting the bump map. Should this ever change
// this negate must be removed.
norfac = -hScale * mtex->norfac;
- if(found_deriv_map) norfac /= MAX2(sqrtf(ima_x*mtex->size[0]*ima_y*mtex->size[1]), FLT_EPSILON);
+ if(found_deriv_map)
+ {
+ float fVirtDim = sqrtf(ima_x*mtex->size[0]*ima_y*mtex->size[1]);
+ norfac /= MAX2(fVirtDim, FLT_EPSILON);
+ }
tnorfac = GPU_uniform(&norfac);
Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c 2012-01-03 22:09:22 UTC (rev 43106)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c 2012-01-03 22:18:52 UTC (rev 43107)
@@ -1969,7 +1969,10 @@
{
auto_bump = shi->obr->ob->derivedFinal->auto_bump_scale;
}
- auto_bump /= MAX2(sqrtf((float) (dimx*dimy)*mtex->size[0]*mtex->size[1]), FLT_EPSILON);
+ {
+ float fVirtDim = sqrtf((float) (dimx*dimy)*mtex->size[0]*mtex->size[1]);
+ auto_bump /= MAX2(fVirtDim, FLT_EPSILON);
+ }
// this variant using a derivative map is described here
// http://mmikkelsen3d.blogspot.com/2011/07/derivative-maps.html
More information about the Bf-blender-cvs
mailing list