Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-11-27 19:10:22 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-11-27 19:10:22 +0400
commiteda56398afd140b02038991888c458c57923e6b9 (patch)
tree2d8eb90340880fa09997b6a94b55d5d2f121a6fc /source/blender/editors/space_clip
parentc9d84ab5ed3ba8ff89f7205d614c93fc92f83262 (diff)
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.
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/tracking_ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index d97b112e95d..a29524de36d 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1409,7 +1409,7 @@ static void solve_camera_freejob(void *scv)
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;