[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42648] trunk/blender/source/blender: reenabled auto scale for derivative maps

[Morten Mikkelsen]

Revision: 42648
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42648
Author:   mmikkelsen
Date:     2011-12-15 15:48:44 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
reenabled auto scale for derivative maps

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/render/intern/source/render_texture.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-12-15 13:58:09 UTC (rev 42647)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-12-15 15:48:44 UTC (rev 42648)
@@ -2006,14 +2006,9 @@
 		tfdata = fdata;
 
 	/* calc auto bump scale if necessary */
-#if 0
 	if(dm->auto_bump_scale<=0.0f)
 		DM_calc_auto_bump_scale(dm);
-#else
-	dm->auto_bump_scale = 1.0f; // will revert this after release
-#endif
 
-
 	/* add a tangent layer if necessary */
 	for(b = 0; b < gattribs->totlayer; b++)
 		if(gattribs->layer[b].type == CD_TANGENT)

Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c	2011-12-15 13:58:09 UTC (rev 42647)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c	2011-12-15 15:48:44 UTC (rev 42648)
@@ -1968,8 +1968,8 @@
 		if(shi->obr->ob->derivedFinal)
 		{
 			auto_bump = shi->obr->ob->derivedFinal->auto_bump_scale;
-			auto_bump /= sqrtf((float) (dimx*dimy));
 		}
+		auto_bump /= sqrtf((float) (dimx*dimy));
 		
 		// this variant using a derivative map is described here
 		// http://mmikkelsen3d.blogspot.com/2011/07/derivative-maps.html