[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56311] branches/soc-2011-tomato/source/ blender/editors/space_clip/tracking_ops.c: Setting tracking object scale shall not depend on active object

[Sergey Sharybin]

Revision: 56311
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56311
Author:   nazgul
Date:     2013-04-26 11:43:23 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Setting tracking object scale shall not depend on active object

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2013-04-26 11:43:19 UTC (rev 56310)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2013-04-26 11:43:23 UTC (rev 56311)
@@ -2274,11 +2274,13 @@
 		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);