now dragging an image onto an empty can be done without holding Ctrl.

Make it set the empty draw type for existing empty object.
change from yakca on IRC

also some whitespace cleanup.

1 files changed, 6 insertions, 9 deletions

diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index c1e42294e71..57755231240 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -526,15 +526,12 @@ static int view3d_ima_bg_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
 
 static int view3d_ima_empty_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
 {
-	Base *base;
-
-	if (!event->ctrl)
-		return false;
+	Base *base = ED_view3d_give_base_under_cursor(C, event->mval);
 
-	base = ED_view3d_give_base_under_cursor(C, event->mval);
-	if (!base || (base && base->object->type == OB_EMPTY)) {
+	/* either holding and ctrl and no object, or dropping to empty */
+	if ((event->ctrl && !base) || (base && base->object->type == OB_EMPTY))
 		return view3d_ima_drop_poll(C, drag, event);
-	}
+
 	return 0;
 }
 
@@ -543,8 +540,8 @@ static int view3d_ima_mesh_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
 	Base *base = ED_view3d_give_base_under_cursor(C, event->mval);
 
 	if (base && base->object->type == OB_MESH)
- 		return view3d_ima_drop_poll(C, drag, event);
- 	return 0;
+		return view3d_ima_drop_poll(C, drag, event);
+	return 0;
 }
 
 static void view3d_ob_drop_copy(wmDrag *drag, wmDropBox *drop)