diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 07:43:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 07:43:55 +0300 |
| commit | cc10d8653575e0d299b330521c98027f1dc8da36 (patch) | |
| tree | e48d07b85d634119b9b1c52fe8dc480949eba7ba /source/blender/collada/AnimationImporter.cpp | |
| parent | 4719e7ec7a9c3095117bd2b0b08aeb1d72c62d98 (diff) | |
DNA: rename Object.size -> scale
Resolves a common cause of confusion.
Diffstat (limited to 'source/blender/collada/AnimationImporter.cpp')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |