merge with/from trunk at r35190
[blender.git] / source / blender / editors / space_view3d / space_view3d.c
index 96ef339a9b9911bb5b1acb5c8044c6f36c3078ea..dd3b5f42b894c37b3eeffd0ce56c5f50cff9c222 100644 (file)
@@ -434,6 +434,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);
 }