From cc10d8653575e0d299b330521c98027f1dc8da36 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 18 Feb 2019 15:43:06 +1100 Subject: DNA: rename Object.size -> scale Resolves a common cause of confusion. --- source/blender/collada/AnimationImporter.cpp | 4 ++-- source/blender/collada/TransformWriter.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index e7e77ee5e41..edb796f743f 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -1938,7 +1938,7 @@ Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::No job->lay = BKE_scene_base_find(scene, job)->lay = 2; - mul_v3_fl(job->size, 0.5f); + mul_v3_fl(job->scale, 0.5f); DEG_id_tag_update(&job->id, ID_RECALC_TRANSFORM); verify_adt_action((ID *)&job->id, 1); @@ -1955,7 +1955,7 @@ Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::No mul_m4_m4m4(mat, ipar, temp); } - bc_decompose(mat, job->loc, NULL, job->quat, job->size); + bc_decompose(mat, job->loc, NULL, job->quat, job->scale); if (par_job) { job->parent = par_job; diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index cd2d4453429..7b5356d2dce 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -70,11 +70,11 @@ void TransformWriter::add_node_transform_ob( // factor out scale from obmat - copy_v3_v3(scale, ob->size); + copy_v3_v3(scale, ob->scale); - ob->size[0] = ob->size[1] = ob->size[2] = 1.0f; + ob->scale[0] = ob->scale[1] = ob->scale[2] = 1.0f; BKE_object_to_mat4(ob, C); - copy_v3_v3(ob->size, scale); + copy_v3_v3(ob->scale, scale); mul_m4_series(tmat, ob->parent->obmat, ob->parentinv, C); @@ -91,7 +91,7 @@ void TransformWriter::add_node_transform_ob( else { copy_v3_v3(loc, ob->loc); copy_v3_v3(rot, ob->rot); - copy_v3_v3(scale, ob->size); + copy_v3_v3(scale, ob->scale); } add_transform(node, loc, rot, scale); -- cgit v1.2.3