diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-11-30 19:18:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-11-30 19:21:39 +0300 |
| commit | fd4cd626be9542a58fe5b30bf9409d5e435ff140 (patch) | |
| tree | b152e25ce25976bc22a065a3b8b4e428bb1fe579 /source/blender/editors/space_image/space_image.c | |
| parent | 503dbb65c02b0cd0d80f0cbed6419285162b3262 (diff) | |
More fixes related to D&D:
* Same issue as T42760 was also reproducible in some cases in 3DView.
* You got an error message about missing RNA prop in some drop-called operators.
* You could not drop a movie file in nodes, (some cases of) 3DView, nor ImageEditor.
Diffstat (limited to 'source/blender/editors/space_image/space_image.c')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 5dc9af2de84..df78dfa4a14 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -356,7 +356,7 @@ static void image_keymap(struct wmKeyConfig *keyconf) static int image_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event)) { if (drag->type == WM_DRAG_PATH) - if (ELEM(drag->icon, 0, ICON_FILE_IMAGE, ICON_FILE_BLANK)) /* rule might not work? */ + if (ELEM(drag->icon, 0, ICON_FILE_IMAGE, ICON_FILE_MOVIE, ICON_FILE_BLANK)) /* rule might not work? */ return 1; return 0; } |