disabling DM_calc_auto_bump_scale() until after release
authorMorten Mikkelsen <mikkelsen7@gmail.com>
Sat, 10 Dec 2011 01:14:36 +0000 (01:14 +0000)
committerMorten Mikkelsen <mikkelsen7@gmail.com>
Sat, 10 Dec 2011 01:14:36 +0000 (01:14 +0000)
source/blender/blenkernel/intern/DerivedMesh.c

index 06f29b95825b550c51dc47c81cf14890ea239ac2..0087b91c6158f37858c90032e4df1f545a2c8d89 100644 (file)
@@ -2006,8 +2006,13 @@ void DM_vertex_attributes_from_gpu(DerivedMesh *dm, GPUVertexAttribs *gattribs,
                tfdata = fdata;
 
        /* calc auto bump scale if necessary */
                tfdata = fdata;
 
        /* calc auto bump scale if necessary */
+#if 0
        if(dm->auto_bump_scale<=0.0f)
                DM_calc_auto_bump_scale(dm);
        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++)
 
        /* add a tangent layer if necessary */
        for(b = 0; b < gattribs->totlayer; b++)