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.

3 files changed, 9 insertions, 12 deletions

diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 7a2975375a9..36b9463a61c 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -2951,7 +2951,7 @@ void MESH_OT_select_random(wmOperatorType *ot)
 	/* props */
 	RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f,
 	                         "Percent", "Percentage of elements to select randomly", 0.f, 100.0f);
- 	RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend the selection");
+	RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend the selection");
 }
 
 static int edbm_select_next_loop_exec(bContext *C, wmOperator *UNUSED(op))
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 81372a753df..997cbb71683 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -777,16 +777,16 @@ static int empty_drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *e
 			return OPERATOR_CANCELLED;
 
 		ob = ED_object_add_type(C, OB_EMPTY, NULL, rot, FALSE, layer);
-		ob->empty_drawtype = OB_EMPTY_IMAGE;
 
 		/* add under the mouse */
 		ED_object_location_from_view(C, ob->loc);
 		ED_view3d_cursor3d_position(C, ob->loc, event->mval);
 	}
 
+	ob->empty_drawtype = OB_EMPTY_IMAGE;
 	ob->data = ima;
 
- 	return OPERATOR_FINISHED;
+	return OPERATOR_FINISHED;
 }
 
 void OBJECT_OT_drop_named_image(wmOperatorType *ot)
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)