=bmesh= merge from trunk at r36529
[blender.git] / source / blender / editors / space_view3d / space_view3d.c
index b26883b8fd6a5b83a4831085899654c0521f5c9b..c4eba5e0962a197224ef17f0f64a9ae8dad69b90 100644 (file)
@@ -477,6 +477,7 @@ static int view3d_ima_bg_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
        if( ED_view3d_give_base_under_cursor(C, event->mval) ) {
                return 0;
        }
+
        return view3d_ima_drop_poll(C, drag, event);
 }