[Bf-blender-cvs] [fe8a48ac54a] soc-2019-bevel-profiles: Merge branch 'master' into soc-2019-bevel-profiles

[Hans Goudey]

Commit: fe8a48ac54a6e8fde69a975d1cb6354da1ef3aee
Author: Hans Goudey
Date:   Tue Nov 5 18:48:49 2019 -0500
Branches: soc-2019-bevel-profiles
https://developer.blender.org/rBfe8a48ac54a6e8fde69a975d1cb6354da1ef3aee

Merge branch 'master' into soc-2019-bevel-profiles

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 35ab24356f3,50363e3f42a..0e2f812807c
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3933,29 -3932,10 +3933,35 @@@ void blo_do_versions_280(FileData *fd, 
  
    {
      /* Versioning code until next subversion bump goes here. */
 +
+     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+       for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+         sa->flag &= ~AREA_FLAG_UNUSED_6;
+       }
+     }
++
 +    /* Add custom curve profile to toolsettings for bevel tool */
 +    if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "CurveProfile", "custom_profile")) {
 +      for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +        ToolSettings *ts = scene->toolsettings;
 +        if ((ts) && (ts->custom_profile == NULL)) {
 +          ts->custom_profile = BKE_curveprofile_add(PROF_PRESET_LINE);
 +        }
 +      }
 +    }
 +
 +    /* Add custom curve profile to bevel modifier */
 +    if (!DNA_struct_elem_find(fd->filesdna, "BevelModifier", "CurveProfile", "custom_profile")) {
 +      for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
 +        for (ModifierData *md = object->modifiers.first; md; md = md->next) {
 +          if (md->type == eModifierType_Bevel) {
 +            BevelModifierData *bmd = (BevelModifierData *)md;
 +            if (!bmd->custom_profile) {
 +              bmd->custom_profile = BKE_curveprofile_add(PROF_PRESET_LINE);
 +            }
 +          }
 +        }
 +      }
 +    }
    }
  }