Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesrna / intern / rna_sequencer.c
index 4ccd1305d76f278f9b2420d287a8d94015be975c..433ca729c65af5ad244fcb57bf901c63b3ca10d0 100644 (file)
@@ -1516,6 +1516,7 @@ static void rna_def_sequence(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_LOCK);
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_ui_icon(prop, ICON_UNLOCKED, true);
        RNA_def_property_ui_text(prop, "Lock", "Lock strip so that it cannot be transformed");
        RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, NULL);
@@ -1595,6 +1596,7 @@ static void rna_def_sequence(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "channel", PROP_INT, PROP_UNSIGNED);
        RNA_def_property_int_sdna(prop, NULL, "machine");
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_range(prop, 1, MAXSEQ);
        RNA_def_property_ui_text(prop, "Channel", "Y position of the sequence strip");
        RNA_def_property_int_funcs(prop, NULL, "rna_Sequence_channel_set", NULL); /* overlap test */