[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51656] trunk/blender/source/blender: Camera tracking fixes
Sergey Sharybin
sergey.vfx at gmail.com
Fri Oct 26 14:36:50 CEST 2012
Revision: 51656
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51656
Author: nazgul
Date: 2012-10-26 12:36:50 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
Camera tracking fixes
- Dopesheet should be invalidated after solution
- Prevent crash when non-camera object is set as scene camera
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-10-26 11:34:15 UTC (rev 51655)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-10-26 12:36:50 UTC (rev 51656)
@@ -2138,7 +2138,7 @@
context->sync_frame = newframe;
- tracking->dopesheet.ok = FALSE;
+ BKE_tracking_dopesheet_tag_update(tracking);
}
void BKE_tracking_context_sync_user(const MovieTrackingContext *context, MovieClipUser *user)
@@ -2953,6 +2953,7 @@
MovieTrackingReconstruction *reconstruction;
tracks_map_merge(context->tracks_map, tracking);
+ BKE_tracking_dopesheet_tag_update(tracking);
if (context->is_camera) {
reconstruction = &tracking->reconstruction;
@@ -3651,7 +3652,7 @@
}
}
-static void tracking_dopesheet_sort(MovieTracking *tracking, int sort_method, int inverse)
+static void tracking_dopesheet_sort(MovieTracking *tracking, int sort_method, int inverse)
{
MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2012-10-26 11:34:15 UTC (rev 51655)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2012-10-26 12:36:50 UTC (rev 51656)
@@ -1396,7 +1396,6 @@
}
solved = BKE_tracking_reconstruction_finish(scj->context, tracking);
-
if (!solved)
BKE_report(scj->reports, RPT_WARNING, "Some data failed to reconstruct, see console for details");
else
@@ -1410,7 +1409,7 @@
id_us_plus(&clip->id);
/* set blender camera focal length so result would look fine there */
- if (scene->camera) {
+ if (scene->camera && GS(scene->camera->id.name) == ID_CA) {
Camera *camera = (Camera *)scene->camera->data;
int width, height;
More information about the Bf-blender-cvs
mailing list