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-03-06 15:24:23 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-03-06 15:24:23 +0400
commit2b9551a4e4306b7ec1501da2510a8a35895eb8af (patch)
tree72e8b6c8ad8610899deb02373ba1ea520c8c0c74 /source/blender/blenkernel
parentcc850522bcc4475c72d5c26889b14900e4b0bc97 (diff)
Fixed typo in tracking-related tweaks for depsgraph resulting with crash
in special cases (like setting camera's constraint clip if scene's clip is not set)
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/depsgraph.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index c45687f0b93..eca0c36c49c 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2593,8 +2593,11 @@ static void dag_id_flush_update(Scene *sce, ID *id)
/* camera's matrix is used to orient reconstructed stuff,
so it should happen tracking-related constraints recalculation
when camera is changing (sergey) */
- if(sce->camera && &sce->camera->id == id && object_get_movieclip(sce, sce->camera, 1)) {
- dag_id_flush_update(sce, &sce->clip->id);
+ if(sce->camera && &sce->camera->id == id) {
+ MovieClip *clip = object_get_movieclip(sce, sce->camera, 1);
+
+ if(clip)
+ dag_id_flush_update(sce, clip);
}
/* update editors */