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

Alexander Gavrilov noreply at git.blender.org
Tue Jun 22 15:44:26 CEST 2021


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

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.c

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

diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 2534ba712d5..b6773813909 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -368,7 +368,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