From: Morten Mikkelsen <mikkelsen7@gmail.com>
Date: Sat, 10 Dec 2011 01:14:36 +0000 (+0000)
Subject: disabling DM_calc_auto_bump_scale() until after release
X-Git-Tag: v2.61~34
X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/commitdiff_plain/0cc887e2e9428c0a6715e322071c30e6d10e2506?hp=ae17390b77bfda18d387da32d1158530c19c1fa5

disabling DM_calc_auto_bump_scale() until after release
---

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 06f29b95825..0087b91c615 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2006,8 +2006,13 @@ void DM_vertex_attributes_from_gpu(DerivedMesh *dm, GPUVertexAttribs *gattribs,
 		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++)