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

[YimingWu]

Commit: 6967d60c4b8e9458860eab92fe68cfc9c271ea89
Author: YimingWu
Date:   Thu Nov 28 14:50:40 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rB6967d60c4b8e9458860eab92fe68cfc9c271ea89

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

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 4cc07d070df,7c33e853ed1..d36c4b4c4f4
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3978,17 -4210,26 +4210,38 @@@ void blo_do_versions_280(FileData *fd, 
        }
      }
  
-     if (!DNA_struct_find(fd->filesdna, "SceneLANPR")) {
-       for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
+     /* Cloth pressure */
+     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->pressure_factor = 1;
+         }
+       }
+     }
+   }
+ 
+   {
+     /* Versioning code until next subversion bump goes here. */
  
-         scene->lanpr.crease_threshold = 0.7;
+     /* Remove Unified pressure/size and pressure/alpha */
+     for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
+       ToolSettings *ts = scene->toolsettings;
+       UnifiedPaintSettings *ups = &ts->unified_paint_settings;
+       ups->flag &= ~(UNIFIED_PAINT_FLAG_UNUSED_0 | UNIFIED_PAINT_FLAG_UNUSED_1);
++
++      if (!DNA_struct_find(fd->filesdna, "SceneLANPR")) {
++        for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +
-         scene->lanpr.flags |= (LANPR_USE_CHAINING | LANPR_USE_INTERSECTIONS);
++          scene->lanpr.crease_threshold = 0.7;
 +
-         zero_v4(scene->lanpr.line_color);
++          scene->lanpr.flags |= (LANPR_USE_CHAINING | LANPR_USE_INTERSECTIONS);
 +
-         scene->lanpr.line_color[3] = 1;
++          zero_v4(scene->lanpr.line_color);
++
++          scene->lanpr.line_color[3] = 1;
++        }
 +      }
      }
    }
--}