Merging with trunk up to r38631.
[blender.git] / release / scripts / startup / bl_ui / space_nla.py
index e0b5d842179c4af37c980d4b7e7718116458381c..78489db63177046921579cb5ff8320c59bb1cd76 100644 (file)
@@ -72,7 +72,11 @@ class NLA_MT_view(bpy.types.Menu):
         layout.separator()
         layout.operator("anim.previewrange_set")
         layout.operator("anim.previewrange_clear")
-
+        
+        layout.separator()
+        layout.operator("nla.view_all")
+        layout.operator("nla.view_selected")
+        
         layout.separator()
         layout.operator("screen.area_dupli")
         layout.operator("screen.screen_full_area")
@@ -188,7 +192,7 @@ class NLA_MT_edit_transform(bpy.types.Menu):
         layout.column()
         layout.operator("transform.translate", text="Grab/Move")
         layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
-        # layout.operator("transform.resize", text="Scale")  # crashes [#26792]
+        layout.operator("transform.transform", text="Scale").mode = 'TIME_SCALE'
 
 if __name__ == "__main__":  # only for live edit.
     bpy.utils.register_module(__name__)