[Bf-blender-cvs] [c2c64472290] temp-lanpr-review: Merge remote-tracking branch 'origin/master' into temp-lanpr-review

[YimingWu]

Commit: c2c644722900213f1a567aec072a5fddac107993
Author: YimingWu
Date:   Tue Dec 10 22:13:06 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rBc2c644722900213f1a567aec072a5fddac107993

Merge remote-tracking branch 'origin/master' into temp-lanpr-review

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index fc203f2a1c7,5c7fda67ff0..8de01e6334e
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4281,5 -4268,19 +4281,19 @@@ void blo_do_versions_280(FileData *fd, 
  
    {
      /* Versioning code until next subversion bump goes here. */
+     /* Cloth internal springs */
+     for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
+       for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
+         if (md->type == eModifierType_Cloth) {
+           ClothModifierData *clmd = (ClothModifierData *)md;
+ 
+           clmd->sim_parms->internal_tension = 15.0f;
+           clmd->sim_parms->max_internal_tension = 15.0f;
+           clmd->sim_parms->internal_compression = 15.0f;
+           clmd->sim_parms->max_internal_compression = 15.0f;
+           clmd->sim_parms->internal_spring_max_diversion = M_PI / 4.0f;
+         }
+       }
+     }
    }
 -}
 +}