Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Borghetti <bdiego@gmail.com>2010-07-21 23:49:43 +0400
committerDiego Borghetti <bdiego@gmail.com>2010-07-21 23:49:43 +0400
commit7925de141502b2d94bead44f422a9c55531267a9 (patch)
tree15341e1612286e1231635742b88047a70c9471d7 /source/blender/editors
parent969c0fd718ed500fedfdeb1b4a5c0026febdb975 (diff)
Fix #22894
[#22894] SEQUENCER; Drag & Drop into VSE as strip sends user to file manager for import - MS Windows The invoke function for both operator don't check the the filepath property (this come from the drop event), so always open the file browser. Note that this problem is still there for Image, but there is something else there, because the op SEQUENCER_OT_image_strip_add never got this property (filepath). I check and the problem seems to be the missing WM_FILESEL_FILEPATH when call WM_operator_properties_filesel. The problem is that if I put this flag in the function, the image strip stop working, so have to check a little more about this. (Any idea why ?)
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_add.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index c4c3701a18a..4d51ac05fbd 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -352,6 +352,10 @@ static int sequencer_add_movie_strip_invoke(bContext *C, wmOperator *op, wmEvent
if(!RNA_property_is_set(op->ptr, "relative_path"))
RNA_boolean_set(op->ptr, "relative_path", U.flag & USER_RELPATHS);
+ /* This is for drag and drop */
+ if(RNA_property_is_set(op->ptr, "filepath"))
+ return sequencer_add_movie_strip_exec(C, op);
+
sequencer_generic_invoke_xy__internal(C, op, event, 0);
WM_event_add_fileselect(C, op);
@@ -403,6 +407,10 @@ static int sequencer_add_sound_strip_invoke(bContext *C, wmOperator *op, wmEvent
if(!RNA_property_is_set(op->ptr, "relative_path"))
RNA_boolean_set(op->ptr, "relative_path", U.flag & USER_RELPATHS);
+ /* This is for drag and drop */
+ if(RNA_property_is_set(op->ptr, "filepath"))
+ return sequencer_add_sound_strip_exec(C, op);
+
sequencer_generic_invoke_xy__internal(C, op, event, 0);
WM_event_add_fileselect(C, op);