Merging r39330 through r39390 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 14 Aug 2011 11:17:39 +0000 (11:17 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 14 Aug 2011 11:17:39 +0000 (11:17 +0000)
1  2 
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/startup/bl_ui/space_time.py
release/scripts/startup/bl_ui/space_userpref_keymap.py
source/blender/blenkernel/intern/node.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_ops.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/RNA_access.h
source/blender/modifiers/intern/MOD_uvproject.c

@@@ -248,8 -239,8 +240,9 @@@ class SEQUENCER_MT_strip(Menu)
          layout.operator("sequencer.cut", text="Cut (hard) at frame").type = 'HARD'
          layout.operator("sequencer.cut", text="Cut (soft) at frame").type = 'SOFT'
          layout.operator("sequencer.images_separate")
+         layout.operator("sequencer.offset_clear")
          layout.operator("sequencer.deinterlace_selected_movies")
 +        layout.operator("sequencer.rebuild_proxy")
          layout.separator()
  
          layout.operator("sequencer.duplicate")
Simple merge