Merging r46062 through r46073 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / space_clip / space_clip.c
index 9a5a7120a3df6a89b1db457bac50d96f8dd68102..80db32303cb5661af12b893adf9ac8e56beb71b4 100644 (file)
@@ -718,10 +718,13 @@ static int clip_context(const bContext *C, const char *member, bContextDataResul
 
        if (CTX_data_dir(member)) {
                CTX_data_dir_set(result, clip_context_dir);
+
                return TRUE;
        }
        else if (CTX_data_equals(member, "edit_movieclip")) {
-               CTX_data_id_pointer_set(result, &sc->clip->id);
+               if (sc->clip)
+                       CTX_data_id_pointer_set(result, &sc->clip->id);
+
                return TRUE;
        }