From 3b7b0b9bebcce31ecb63ecc37db824249e37504d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 22 Mar 2012 14:33:51 +0000 Subject: [PATCH] Fix for Add Movie Strip and Add Sound Strip operators and operator property re-use system. --- source/blender/editors/space_sequencer/sequencer_add.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index f7dcab82937..818995bfa23 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -467,7 +467,9 @@ static int sequencer_add_movie_strip_invoke(bContext *C, wmOperator *op, wmEvent } /* This is for drag and drop */ - if(RNA_collection_length(op->ptr, "files") || RNA_struct_property_is_set(op->ptr, "filepath")) { + if((RNA_struct_property_is_set(op->ptr, "files") && RNA_collection_length(op->ptr, "files")) || + RNA_struct_property_is_set(op->ptr, "filepath")) + { sequencer_generic_invoke_xy__internal(C, op, event, SEQPROP_NOPATHS); return sequencer_add_movie_strip_exec(C, op); } @@ -519,7 +521,9 @@ static int sequencer_add_sound_strip_invoke(bContext *C, wmOperator *op, wmEvent } /* This is for drag and drop */ - if(RNA_collection_length(op->ptr, "files") || RNA_struct_property_is_set(op->ptr, "filepath")) { + if((RNA_struct_property_is_set(op->ptr, "files") && RNA_collection_length(op->ptr, "files")) || + RNA_struct_property_is_set(op->ptr, "filepath")) + { sequencer_generic_invoke_xy__internal(C, op, event, SEQPROP_NOPATHS); return sequencer_add_sound_strip_exec(C, op); }