[Bf-blender-cvs] [ff32f74ae84] soc-2019-bevel-profiles: Add versioning for custom profile widget in bevel modifier.
Hans Goudey
noreply at git.blender.org
Fri Jul 26 23:26:50 CEST 2019
Commit: ff32f74ae84bbbf325cc04f381c9b59ceacab6ef
Author: Hans Goudey
Date: Fri Jul 26 16:57:53 2019 -0400
Branches: soc-2019-bevel-profiles
https://developer.blender.org/rBff32f74ae84bbbf325cc04f381c9b59ceacab6ef
Add versioning for custom profile widget in bevel modifier.
===================================================================
M source/blender/blenloader/intern/versioning_280.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index bd55721b215..153eb37e6aa 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3532,8 +3532,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
arm->flag &= ~(ARM_FLAG_UNUSED_6);
}
+ }
+
+ {
+ /* Versioning code until next subversion bump goes here. */
- /* HANS-TODO: Versioning for bevel modifier and test it */
+ /* Add custom profile widget to toolsettings for bevel tool */
if (!DNA_struct_elem_find(
fd->filesdna, "ToolSettings", "ProfileWidget", "prwdgt")) {
for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
@@ -3543,9 +3547,19 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
- }
- {
- /* Versioning code until next subversion bump goes here. */
+ /* Add custom profile widget to bevel modifier */
+ if (!DNA_struct_elem_find(fd->filesdna, "BevelModifier", "ProfileWidget", "prwdgt")) {
+ 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->prwdgt) {
+ bmd->prwdgt = profilewidget_add(PROF_PRESET_LINE);
+ }
+ }
+ }
+ }
+ }
}
}
More information about the Bf-blender-cvs
mailing list