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

Alexander Gavrilov noreply at git.blender.org
Thu Sep 29 19:22:19 CEST 2022


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

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 878a4078295..bdd85aacb02 100644
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@ -2031,7 +2031,8 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(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