[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42547] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: disabling DM_calc_auto_bump_scale() until after release

[Morten Mikkelsen]

Revision: 42547
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42547
Author:   mmikkelsen
Date:     2011-12-10 01:14:36 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
disabling DM_calc_auto_bump_scale() until after release

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

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c        
2011-12-10 01:07:22 UTC (rev 42546)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c        
2011-12-10 01:14:36 UTC (rev 42547)
@@ -1834,7 +1834,7 @@
 
 void DM_calc_auto_bump_scale(DerivedMesh *dm)
 {
-       /* int totvert= dm->getNumVerts(dm); */ /* UNUSED */
+       int totvert= dm->getNumVerts(dm);
        int totface= dm->getNumFaces(dm);
 
        MVert * mvert = dm->getVertArray(dm);
@@ -2006,9 +2006,14 @@
                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)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs