[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28725] trunk/blender/source/blender/ editors/space_view3d/space_view3d.c: Dropbox refinement in 3d window: the " drop image" dropbox checks for

[Ton Roosendaal]

Revision: 28725
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28725
Author:   ton
Date:     2010-05-11 16:25:48 +0200 (Tue, 11 May 2010)

Log Message:
-----------
Dropbox refinement in 3d window: the "drop image" dropbox checks for
object under mouse cursor. If not, another dropbox operation can be used.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-05-11 07:08:32 UTC (rev 28724)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-05-11 14:25:48 UTC (rev 28725)
@@ -413,15 +413,17 @@
 
 static int view3d_ima_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
 {
-	if(drag->type==WM_DRAG_ID) {
-		ID *id= (ID *)drag->poin;
-		if( GS(id->name)==ID_IM )
-			return 1;
+	if( ED_view3d_give_base_under_cursor(C, event->mval) ) {
+		if(drag->type==WM_DRAG_ID) {
+			ID *id= (ID *)drag->poin;
+			if( GS(id->name)==ID_IM )
+				return 1;
+		}
+		else if(drag->type==WM_DRAG_PATH){
+			if(ELEM(drag->icon, 0, ICON_FILE_IMAGE))	/* rule might not work? */
+				return 1;
+		}
 	}
-	else if(drag->type==WM_DRAG_PATH){
-		if(ELEM(drag->icon, 0, ICON_FILE_IMAGE))	/* rule might not work? */
-			return 1;
-	}
 	return 0;
 }