Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-18 07:43:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-18 07:43:55 +0300
commitcc10d8653575e0d299b330521c98027f1dc8da36 (patch)
treee48d07b85d634119b9b1c52fe8dc480949eba7ba /source/blender/editors/space_clip/tracking_ops_orient.c
parent4719e7ec7a9c3095117bd2b0b08aeb1d72c62d98 (diff)
DNA: rename Object.size -> scale
Resolves a common cause of confusion.
Diffstat (limited to 'source/blender/editors/space_clip/tracking_ops_orient.c')
-rw-r--r--source/blender/editors/space_clip/tracking_ops_orient.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c
index 4ad63a6c6b4..2df74240241 100644
--- a/source/blender/editors/space_clip/tracking_ops_orient.c
+++ b/source/blender/editors/space_clip/tracking_ops_orient.c
@@ -670,18 +670,18 @@ static int do_set_scale(bContext *C,
}
else {
if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
- mul_v3_fl(object->size, scale);
+ mul_v3_fl(object->scale, scale);
mul_v3_fl(object->loc, scale);
}
else if (!scale_solution) {
Object *solver_camera = object_solver_camera(scene, object);
- object->size[0] = object->size[1] = object->size[2] = 1.0f / scale;
+ object->scale[0] = object->scale[1] = object->scale[2] = 1.0f / scale;
if (solver_camera) {
- object->size[0] /= solver_camera->size[0];
- object->size[1] /= solver_camera->size[1];
- object->size[2] /= solver_camera->size[2];
+ object->scale[0] /= solver_camera->scale[0];
+ object->scale[1] /= solver_camera->scale[1];
+ object->scale[2] /= solver_camera->scale[2];
}
}
else {