Commit: 33d9a0c9518ab0ec337d7ffd9b3efaa39d945862
Author: Campbell Barton
Date: Thu Apr 22 16:33:37 2021 +1000
Branches: master
https://developer.blender.org/rB33d9a0c9518ab0ec337d7ffd9b3efaa39d945862
Merge branch 'blender-v2.93-release'
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_300.c
index e98062c3703,00000000000..2d29f496e71
mode 100644,000000..100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -1,63 -1,0 +1,81 @@@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/** \file
+ * \ingroup blenloader
+ */
+/* allow readfile to use deprecated functionality */
+#define DNA_DEPRECATED_ALLOW
+
++#include "BLI_listbase.h"
++#include "BLI_utildefines.h"
++
++#include "DNA_genfile.h"
++#include "DNA_modifier_types.h"
++
+#include "BKE_main.h"
+
+#include "BLO_readfile.h"
+#include "readfile.h"
+
+void do_versions_after_linking_300(Main *UNUSED(bmain), ReportList *UNUSED(reports))
+{
-
+ /**
+ * Versioning code until next subversion bump goes here.
+ *
+ * \note Be sure to check when bumping the version:
+ * - #blo_do_versions_300 in this file.
+ * - "versioning_userdef.c", #blo_do_versions_userdef
+ * - "versioning_userdef.c", #do_versions_theme
+ *
+ * \note Keep this message at the bottom of the function.
+ */
+ {
+ /* Keep this block, even when empty. */
+ }
+}
+
+/* NOLINTNEXTLINE: readability-function-size */
- void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *UNUSED(bmain))
++void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
+{
+ UNUSED_VARS(fd);
+
+ /**
+ * Versioning code until next subversion bump goes here.
+ *
+ * \note Be sure to check when bumping the version:
+ * - "versioning_userdef.c", #blo_do_versions_userdef
+ * - "versioning_userdef.c", #do_versions_theme
+ *
+ * \note Keep this message at the bottom of the function.
+ */
+ {
+ /* Keep this block, even when empty. */
++
++ /* Set default value for the new bisect_threshold parameter in the mirror modifier. */
++ if (!DNA_struct_elem_find(fd->filesdna, "MirrorModifierData", "float", "bisect_threshold")) {
++ LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
++ LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
++ if (md->type == eModifierType_Mirror) {
++ MirrorModifierData *mmd = (MirrorModifierData *)md;
++ /* This was the previous hard-coded value. */
++ mmd->bisect_threshold = 0.001f;
++ }
++ }
++ }
++ }
+ }
+}