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-10-26 16:36:50 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-10-26 16:36:50 +0400
commit9b110f2f64812eef5dfc02a4f2fcbd6d64fb4d35 (patch)
tree86259fd2c85b55f76a5fc64cc02224e9c8fd9f52 /source/blender/editors/space_clip
parentde72ffa69b70f0b059d0cf1a4f14cdc3073d4da8 (diff)
Camera tracking fixes
- Dopesheet should be invalidated after solution - Prevent crash when non-camera object is set as scene camera
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/tracking_ops.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 521b1383db8..2f1265b6a4d 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1396,7 +1396,6 @@ static void solve_camera_freejob(void *scv)
}
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 @@ 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) {
+ if (scene->camera && GS(scene->camera->id.name) == ID_CA) {
Camera *camera = (Camera *)scene->camera->data;
int width, height;