Setting tracking object scale shall not depend on active object

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);