[Bf-blender-cvs] [ae609346ee9] master: Fix T81672: Array modifier default merge distance is 0.1m (typo)

[Philipp Oeser]

Commit: ae609346ee98e53d9038878b8d83205cc9b555ff
Author: Philipp Oeser
Date:   Tue Oct 13 13:40:05 2020 +0200
Branches: master
https://developer.blender.org/rBae609346ee98e53d9038878b8d83205cc9b555ff

Fix T81672: Array modifier default merge distance is 0.1m (typo)

Seems to be an oversight/typo in rB83980506957c.
Now set back to 0.01m (as it was before).

Maniphest Tasks: T81672

Differential Revision: https://developer.blender.org/D9193

===================================================================

M	source/blender/makesdna/DNA_modifier_defaults.h

===================================================================

diff --git a/source/blender/makesdna/DNA_modifier_defaults.h b/source/blender/makesdna/DNA_modifier_defaults.h
index 41db7c914aa..3aca558cdbe 100644
--- a/source/blender/makesdna/DNA_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_modifier_defaults.h
@@ -41,7 +41,7 @@
     .offset = {1.0f, 0.0f, 0.0f}, \
     .scale = {1.0f, 0.0f, 0.0f}, \
     .length = 0.0f, \
-    .merge_dist = 0.1f, \
+    .merge_dist = 0.01f, \
     .fit_type = MOD_ARR_FIXEDCOUNT, \
     .offset_type = MOD_ARR_OFF_RELATIVE, \
     .flags = 0, \