svn merge ^/trunk/blender -r42617:42655
[blender.git] / source / blender / blenkernel / intern / DerivedMesh.c
index 8405a3922e6b285113db76321a7f265516ab67dc..768e18b98719cda746ba5ad6643122ea04bf22f2 100644 (file)
@@ -2392,13 +2392,8 @@ void DM_vertex_attributes_from_gpu(DerivedMesh *dm, GPUVertexAttribs *gattribs,
        fdata = tfdata = dm->getTessFaceDataLayout(dm);
        
        /* 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++)