[Bf-blender-cvs] [019cd2e56b3] soc-2020-soft-body: merged from master

[mattoverby]

Commit: 019cd2e56b377a35b1fa2c85aebe60fb8c495335
Author: mattoverby
Date:   Fri Aug 28 14:18:21 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rB019cd2e56b377a35b1fa2c85aebe60fb8c495335

merged from master

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



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

diff --cc CMakeLists.txt
index d59a57ba70b,76d2d578dc3..e8df9386a4e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1725,9 -1738,9 +1741,10 @@@ if(FIRST_RUN
    info_cfg_option(WITH_OPENVDB)
    info_cfg_option(WITH_ALEMBIC)
    info_cfg_option(WITH_QUADRIFLOW)
 +  info_cfg_option(WITH_TETGEN)
    info_cfg_option(WITH_USD)
    info_cfg_option(WITH_TBB)
+   info_cfg_option(WITH_GMP)
  
    info_cfg_text("Compiler Options:")
    info_cfg_option(WITH_BUILDINFO)
diff --cc release/datafiles/locale
index 260b439d0fb,260b439d0fb..2a85baf7318
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 260b439d0fb15e3cd1efe5c120cf24f91d13d855
++Subproject commit 2a85baf7318e2d8a26a25e6eb8211a2395d44a76
diff --cc release/scripts/addons
index 6ba9c816f3d,01cf2f810ad..88685da2c5d
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 6ba9c816f3d8b342633cce3f874876f19b19118e
 -Subproject commit 01cf2f810ad084cb4e2dad6dc7f82f3bc05f2a06
++Subproject commit 88685da2c5d21cbde0412dba98f65b05f0d0bba0
diff --cc source/blender/blenloader/intern/versioning_290.c
index 3c96d383434,3c326565557..aa222616e4c
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -492,5 -493,41 +494,49 @@@ void blo_do_versions_290(FileData *fd, 
          }
        }
      }
+ 
+     /* Remove panel X axis collapsing, a remnant of horizontal panel alignment. */
+     LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+       LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+         LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
+           LISTBASE_FOREACH (Panel *, panel, &region->panels) {
+             panels_remove_x_closed_flag_recursive(panel);
+           }
+         }
+       }
+     }
+ 
+     /* Initialize solver for Boolean. */
+     if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData", "enum", "solver")) {
+       for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
+         LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
+           if (md->type == eModifierType_Boolean) {
+             BooleanModifierData *bmd = (BooleanModifierData *)md;
+             bmd->solver = eBooleanModifierSolver_Fast;
+           }
+         }
+       }
+     }
+   }
+ 
++  if (!DNA_struct_elem_find(fd->filesdna, "SoftBody", "int", "solver_mode")) {
++    for (Object *ob = bmain->objects.first; ob != NULL; ob = ob->id.next) {
++      if (ob->soft != NULL) {
++        sbExternalSetDefault(ob->soft);
++      }
++    }
++  }
++
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #BLO_version_defaults_userpref_blend
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* Keep this block, even when empty. */
    }
  }