[Bf-blender-cvs] [ecf2f1593a5] master: Fix T51646: Motion Tracker instantly crashes

[Sergey Sharybin]

Commit: ecf2f1593a50e95453d883cbf69d54df409bac4a
Author: Sergey Sharybin
Date:   Mon May 29 09:40:43 2017 +0200
Branches: master
https://developer.blender.org/rBecf2f1593a50e95453d883cbf69d54df409bac4a

Fix T51646: Motion Tracker instantly crashes

Was a mistake in previous changes.

Weirdly enough, frame reading assumes cache_key is always non-NULL..

===================================================================

M	intern/libmv/intern/frame_accessor.cc

===================================================================

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,