[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45087] trunk/blender/source/blender/ editors/space_sequencer/sequencer_add.c: Fix for Add Movie Strip and Add Sound Strip operators and operator property re-use system .

[Sergey Sharybin]

Revision: 45087
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45087
Author:   nazgul
Date:     2012-03-22 14:33:51 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Fix for Add Movie Strip and Add Sound Strip operators and operator property re-use system.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c	2012-03-22 14:06:42 UTC (rev 45086)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c	2012-03-22 14:33:51 UTC (rev 45087)
@@ -467,7 +467,9 @@
 	}
 
 	/* 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 @@
 	}
 	
 	/* 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);
 	}