diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-02 16:05:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-02 16:05:25 +0400 |
| commit | 7d5c51a96f28b332093684a6236778bc0a0738ec (patch) | |
| tree | 78ed5eb77191eeaf3437f1852e816de496cfebc1 /source/blender/editors/object/object_add.c | |
| parent | 8f01b50e147b701fb0b3e2251fec88bec645df50 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |