diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-09 20:38:50 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-09 20:38:50 +0400 |
commit | 5eefcb95dfdb60e7a754b283c8e9907a5b5f638f (patch) | |
tree | a2c84eff50f1814a7552f4a849e627057a52e50b | |
parent | 2e96e41da31ce463c6dd808d774cea371ba6e78b (diff) |
Setting tracking object scale shall not depend on active object
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 1c4ea8b5546..c509e12981c 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -2274,11 +2274,13 @@ static int do_set_scale(bContext *C, wmOperator *op, int scale_solution) return OPERATOR_CANCELLED; } - object = get_orientation_object(C); - if (!object) { - BKE_report(op->reports, RPT_ERROR, "No object to apply orientation on"); + if (!scale_solution) { + object = get_orientation_object(C); + if (!object) { + BKE_report(op->reports, RPT_ERROR, "No object to apply orientation on"); - return OPERATOR_CANCELLED; + return OPERATOR_CANCELLED; + } } BKE_tracking_get_camera_object_matrix(scene, camera, mat); |