[Bf-blender-cvs] [ea9ea63c522] temp-angavrilov: Temporary Hack: provide B-Bone scale versioning for files with old patch.

Alexander Gavrilov noreply at git.blender.org
Fri Jan 6 16:56:35 CET 2023


Commit: ea9ea63c5227e0cc168119530d61a2175d1d73e8
Author: Alexander Gavrilov
Date:   Tue Jun 22 16:38:26 2021 +0300
Branches: temp-angavrilov
https://developer.blender.org/rBea9ea63c5227e0cc168119530d61a2175d1d73e8

Temporary Hack: provide B-Bone scale versioning for files with old patch.

Run the versioning code for the conversion of bbone scale to an xyz
vector if it has fields that correspond to the old version of the
patch before that change requiring versioning.

The actual Y (length) scale value from the old patch isn't versioned
and will be lost, requiring manual fixing.

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

M	source/blender/blenloader/intern/versioning_300.cc

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

diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc
index 38ecfaf41ea..dbd61b9c3e2 100644
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@ -2140,7 +2140,8 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
     }
 
     /* Initialize length-wise scale B-Bone settings. */
-    if (!DNA_struct_elem_find(fd->filesdna, "Bone", "int", "bbone_flag")) {
+    if (!DNA_struct_elem_find(fd->filesdna, "Bone", "int", "bbone_flag") ||
+        DNA_struct_elem_find(fd->filesdna, "Bone", "float", "scale_in_len")) {
       /* Update armature data and pose channels. */
       LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
         do_version_bones_bbone_len_scale(&arm->bonebase);



More information about the Bf-blender-cvs mailing list