[Bf-blender-cvs] [79f27fc8d33] master: Fix T51947: failure setting sequence.use_proxy/crop/translation to False

[Brecht Van Lommel]

Commit: 79f27fc8d3396e3d2c9a204be08a9d97c75aab63
Author: Brecht Van Lommel
Date:   Sat Jul 1 22:14:34 2017 +0200
Branches: master
https://developer.blender.org/rB79f27fc8d3396e3d2c9a204be08a9d97c75aab63

Fix T51947: failure setting sequence.use_proxy/crop/translation to False

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

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

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

diff --git a/source/blender/blenkernel/intern/sequencer.c 
b/source/blender/blenkernel/intern/sequencer.c
index dbdffa54d29..669f76cf90b 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2082,7 +2082,7 @@ void BKE_sequencer_proxy_set(struct Sequence *seq, bool 
value)
                }
        }
        else {
-               seq->flag ^= SEQ_USE_PROXY;
+               seq->flag &= ~SEQ_USE_PROXY;
        }       
 }
 
diff --git a/source/blender/makesrna/intern/rna_sequencer.c 
b/source/blender/makesrna/intern/rna_sequencer.c
index 6f8aa32da86..f628c5f14d9 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -341,7 +341,7 @@ static void rna_Sequence_use_translation_set(PointerRNA 
*ptr, int value)
                }
        }
        else {
-               seq->flag ^= SEQ_USE_TRANSFORM;
+               seq->flag &= ~SEQ_USE_TRANSFORM;
        }
 }
 
@@ -355,7 +355,7 @@ static void rna_Sequence_use_crop_set(PointerRNA *ptr, int 
value)
                }
        }
        else {
-               seq->flag ^= SEQ_USE_CROP;
+               seq->flag &= ~SEQ_USE_CROP;
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs