[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56634] trunk/blender/source/blender/ editors/space_clip/tracking_ops.c: Setting tracking object scale shall not depend on active object
Sergey Sharybin
sergey.vfx at gmail.com
Thu May 9 18:38:50 CEST 2013
Revision: 56634
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56634
Author: nazgul
Date: 2013-05-09 16:38:50 +0000 (Thu, 09 May 2013)
Log Message:
-----------
Setting tracking object scale shall not depend on active object
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2013-05-09 16:38:47 UTC (rev 56633)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2013-05-09 16:38:50 UTC (rev 56634)
@@ -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);
More information about the Bf-blender-cvs
mailing list