[Bf-blender-cvs] [ee128c3] blender-v2.77-release: Fix T47962: It's possible to set a Sound strip as a modifier Mask.
Bastien Montagne
noreply at git.blender.org
Tue Apr 5 10:38:24 CEST 2016
Commit: ee128c348fa12fa0be53a6f8ae3f7bda08c5d664
Author: Bastien Montagne
Date: Sun Mar 27 13:01:58 2016 +0200
Branches: blender-v2.77-release
https://developer.blender.org/rBee128c348fa12fa0be53a6f8ae3f7bda08c5d664
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