Merging r50172 through r50173 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 24 Aug 2012 09:45:42 +0000 (09:45 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 24 Aug 2012 09:45:42 +0000 (09:45 +0000)
1  2 
source/blender/makesrna/intern/rna_sequencer.c

index 0e0e00cc8db9c016e767c8cdb32ed7f58aa43934,a3884b62ec125472285d7cfc292f92954622b0c3..88952e6cecac3a50803f4ae00ed121d5f3e6ae17
@@@ -661,7 -661,7 +661,7 @@@ static void rna_Sequence_update_reopen_
        Scene *scene = (Scene *) ptr->id.data;
        Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
  
 -      BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE, FALSE);
 +      BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE);
  
        if (RNA_struct_is_a(ptr->type, &RNA_SoundSequence))
                BKE_sequencer_update_sound_bounds(scene, ptr->data);
@@@ -2354,11 -2354,13 +2354,13 @@@ static void rna_def_brightcontrast_modi
  
        prop = RNA_def_property(srna, "bright", PROP_FLOAT, PROP_UNSIGNED);
        RNA_def_property_float_sdna(prop, NULL, "bright");
+       RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
        RNA_def_property_ui_text(prop, "Bright", "");
        RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_SequenceModifier_update");
  
        prop = RNA_def_property(srna, "contrast", PROP_FLOAT, PROP_UNSIGNED);
        RNA_def_property_float_sdna(prop, NULL, "contrast");
+       RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
        RNA_def_property_ui_text(prop, "Contrast", "");
        RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_SequenceModifier_update");
  }