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>2017-05-29 10:40:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-05-29 10:40:43 +0300
commitecf2f1593a50e95453d883cbf69d54df409bac4a (patch)
tree6aa8f989f6dd7560a3857b4521e212e6853433d4 /intern/libmv
parent94a3bc63ccae4989adde688e093227b3cf0df27f (diff)
Fix T51646: Motion Tracker instantly crashes
Was a mistake in previous changes. Weirdly enough, frame reading assumes cache_key is always non-NULL..
Diffstat (limited to 'intern/libmv')
-rw-r--r--intern/libmv/intern/frame_accessor.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/libmv/intern/frame_accessor.cc b/intern/libmv/intern/frame_accessor.cc
index e7fc0ab4883..a741eb88fc7 100644
--- a/intern/libmv/intern/frame_accessor.cc
+++ b/intern/libmv/intern/frame_accessor.cc
@@ -134,6 +134,11 @@ struct LibmvFrameAccessor : public FrameAccessor {
&width,
&height);
+ if (cache_key == NULL) {
+ // No mask for the given track.
+ return NULL;
+ }
+
// TODO(sergey): Dumb code for until we can set data directly.
FloatImage temp_image(float_buffer,
height,