Merging r44003 through r44069 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Feb 2012 19:00:13 +0000 (19:00 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Feb 2012 19:00:13 +0000 (19:00 +0000)
1  2 
source/blender/makesrna/intern/rna_space.c

index cb4151d8aee8eb1f0d8418ad561f2bb806e9ca09,f405b98524cce352e99ceb6bfde2d2bbf9e1bf51..80ddc023250fef49aeb975282547070af8c7aa5f
@@@ -1976,6 -1976,11 +1976,11 @@@ static void rna_def_space_sequencer(Ble
        RNA_def_property_ui_text(prop, "Use Grease Pencil", "Display and edit the grease pencil freehand annotations overlay");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
        
+       prop= RNA_def_property(srna, "show_seconds", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SEQ_DRAWFRAMES);
+       RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames");
+       RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
        /* grease pencil */
        prop= RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
        RNA_def_property_pointer_sdna(prop, NULL, "gpd");
@@@ -2985,11 -2990,6 +2990,11 @@@ static void rna_def_space_clip(BlenderR
        RNA_def_property_ui_text(prop, "Show Tracks", "Display the speed curves (in \"x\" direction red, in \"y\" direction green) for the selected tracks");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CLIP, NULL);
  
 +      prop= RNA_def_property(srna, "use_texture_buffer", PROP_BOOLEAN, PROP_NONE);
 +      RNA_def_property_ui_text(prop, "Use Texture Buffer", "Use texture buffer to display o,age frames frame on screen");
 +      RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_TEXTURE_BUFFER);
 +      RNA_def_property_update(prop, NC_WINDOW, NULL);
 +
        /* ** channels ** */
  
        /* show_red_channel */