Merged changes in the trunk up to revision 44039.
[blender-staging.git] / release / scripts / startup / bl_ui / space_view3d.py
index 5e6edfed0528d5b85688293aac9029d4ab3f0115..5bd46856c9286574ee967e127608c2e16d5097bd 100644 (file)
@@ -751,6 +751,10 @@ class VIEW3D_MT_object_animation(Menu):
         layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...")
         layout.operator("anim.keying_set_active_set", text="Change Keying Set...")
 
+        layout.separator()
+
+        layout.operator("nla.bake", text="Bake Action...")
+
 
 class VIEW3D_MT_object_clear(Menu):
     bl_label = "Clear"
@@ -1642,8 +1646,8 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
         layout.operator("TRANSFORM_OT_edge_crease")
         layout.operator("mesh.loop_multi_select", text="Edge Loop").ring = False
 
-        # uiItemO(layout, "Loopcut", 0, "mesh.loop_cut"); // CutEdgeloop(em, 1);
-        # uiItemO(layout, "Edge Slide", 0, "mesh.edge_slide"); // EdgeSlide(em, 0,0.0);
+        #~ uiItemO(layout, "Loopcut", 0, "mesh.loop_cut"); // CutEdgeloop(em, 1);
+        #~ uiItemO(layout, "Edge Slide", 0, "mesh.edge_slide"); // EdgeSlide(em, 0,0.0);
 
         layout.operator("mesh.loop_multi_select", text="Edge Ring").ring = True