[Bf-blender-cvs] [ce71e2e] master: Fix T47962: It's possible to set a Sound strip as a modifier Mask.

Bastien Montagne noreply at git.blender.org
Sun Mar 27 13:02:55 CEST 2016


Commit: ce71e2e78965b85b122b995f358cbfd26ce3622b
Author: Bastien Montagne
Date:   Sun Mar 27 13:01:58 2016 +0200
Branches: master
https://developer.blender.org/rBce71e2e78965b85b122b995f358cbfd26ce3622b

Fix T47962: It's possible to set a Sound strip as a modifier Mask.

===================================================================

M	source/blender/makesrna/intern/rna_sequencer.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index fae0d1c..856dc8b 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -1027,8 +1027,9 @@ static int rna_SequenceModifier_otherSequence_poll(PointerRNA *ptr, PointerRNA v
 	Sequence *seq = sequence_get_by_modifier(ed, ptr->data);
 	Sequence *cur = (Sequence *) value.data;
 
-	if (seq == cur)
+	if ((seq == cur) || (cur->type == SEQ_TYPE_SOUND_RAM)) {
 		return false;
+	}
 
 	return true;
 }




More information about the Bf-blender-cvs mailing list