[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52607] trunk/blender/source/blender/ editors/space_clip/tracking_ops.c: Camera Tracking: fixed camera solve operator not updating scene camera

[Sergey Sharybin]

Revision: 52607
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52607
Author:   nazgul
Date:     2012-11-27 15:10:22 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Camera Tracking: fixed camera solve operator not updating scene camera

Was own regression caused by fix of crash when non-camera object is used
as scene camera.

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	2012-11-27 14:25:38 UTC (rev 52606)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2012-11-27 15:10:22 UTC (rev 52607)
@@ -1409,7 +1409,7 @@
 	id_us_plus(&clip->id);
 
 	/* set blender camera focal length so result would look fine there */
-	if (scene->camera && GS(scene->camera->id.name) == ID_CA) {
+	if (scene->camera && scene->camera->data && GS(((ID *) scene->camera->data)->name) == ID_CA) {
 		Camera *camera = (Camera *)scene->camera->data;
 		int width, height;