diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-03 17:00:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-03 17:00:39 +0400 |
| commit | f46b384fc5e66949c0c2ce974d2842dd76ee6be8 (patch) | |
| tree | 781f4f5a208bb5c7356f76d80f8c26ce44731fef /source/blender/editors/space_view3d/space_view3d.c | |
| parent | b460674d64df7a598dc057a546e329eba6517287 (diff) | |
Change to key modifier should trigger re-evaluation of drag-and-drop
This change is part of a fix for T40435, but will postpone for now.
Original patch by Sergey Sharybin
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 4d958a50857..b9d8c2a31e8 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -593,8 +593,11 @@ static int view3d_ima_empty_drop_poll(bContext *C, wmDrag *drag, const wmEvent * Base *base = ED_view3d_give_base_under_cursor(C, event->mval); /* either holding and ctrl and no object, or dropping to empty */ - if ((event->ctrl && !base) || (base && base->object->type == OB_EMPTY)) + if (((base == NULL) && event->ctrl) || + ((base != NULL) && base->object->type == OB_EMPTY)) + { return view3d_ima_drop_poll(C, drag, event); + } return 0; } |