changes to defaults for sequencer strip adding

diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index 4f60f5ccd617673dd7b927e39b6f89857bf0a12e..4cba4d0af3a7729049754917f2f3685ee9e11ecc 100644 (file)
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -149,10 +149,8 @@ class SEQUENCER_MT_add(bpy.types.Menu):
                layout.column()
                layout.itemO("sequencer.scene_strip_add", text="Scene")
                layout.itemO("sequencer.movie_strip_add", text="Movie")
-               layout.item_booleanO("sequencer.movie_strip_add", "sound", True, text="Movie & Sound") # FFMPEG ONLY
                layout.itemO("sequencer.image_strip_add", text="Image")
-               layout.itemO("sequencer.sound_strip_add", text="Sound (Ram)")
-               layout.item_booleanO("sequencer.sound_strip_add", "hd", True, text="Sound (Streaming)") # FFMPEG ONLY
+               layout.itemO("sequencer.sound_strip_add", text="Sound")
                
                layout.itemM("SEQUENCER_MT_add_effect")
 

diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 4a300b7390d17c5ea4f3e2de2dff0d46f4bc92b0..99a13c8d9e0280a89e95f835fdf4fa73986386d5 100644 (file)
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -310,7 +310,7 @@ void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot)
        
        WM_operator_properties_filesel(ot, FOLDERFILE|MOVIEFILE);
        sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME);
-       RNA_def_boolean(ot->srna, "sound", FALSE, "Sound", "Load hd sound with the movie"); // XXX need to impliment this
+       RNA_def_boolean(ot->srna, "sound", TRUE, "Sound", "Load hd sound with the movie"); // XXX need to impliment this
 }
 
 
@@ -416,7 +416,7 @@ void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot)
        
        WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE);
        sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME);
-       RNA_def_boolean(ot->srna, "hd", FALSE, "HD Sound", "Load the sound as streaming audio"); // XXX need to impliment this
+       RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Load the sound as streaming audio"); // XXX need to impliment this
 }
 
 /* add image operator */