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

Hans Goudey noreply at git.blender.org
Tue Jul 23 02:39:04 CEST 2019


Commit: 71e76433d5a01e0394b4512f32968e04686268a7
Author: Hans Goudey
Date:   Mon Jul 22 20:40:29 2019 -0400
Branches: soc-2019-bevel-profiles
https://developer.blender.org/rB71e76433d5a01e0394b4512f32968e04686268a7

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

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index d6136bef2bc,cb2b64957f0..bd55721b215
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3510,16 -3531,9 +3532,20 @@@ void blo_do_versions_280(FileData *fd, 
      LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
        arm->flag &= ~(ARM_FLAG_UNUSED_6);
      }
 +
 +    /* HANS-TODO: Versioning for bevel modifier and test it */
 +    if (!DNA_struct_elem_find(
 +            fd->filesdna, "ToolSettings", "ProfileWidget", "prwdgt")) {
 +      for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +        ToolSettings *ts = scene->toolsettings;
 +        if ((ts) && (ts->prwdgt == NULL)) {
 +          ts->prwdgt = profilewidget_add(PROF_PRESET_LINE);
 +        }
 +      }
 +    }
    }
+ 
+   {
+     /* Versioning code until next subversion bump goes here. */
+   }
  }



More information about the Bf-blender-cvs mailing list