svn merge ^/trunk/blender -r48592:HEAD
[blender-staging.git] / source / blender / editors / object / object_ops.c
index f8f4fe9c4e5faa1efc29216b3e2ad8a8470c6206..f857252a6358def4f6b7aae7e32686f04acbfd2b 100644 (file)
@@ -113,6 +113,7 @@ void ED_operatortypes_object(void)
        WM_operatortype_append(OBJECT_OT_delete);
        WM_operatortype_append(OBJECT_OT_text_add);
        WM_operatortype_append(OBJECT_OT_armature_add);
+       WM_operatortype_append(OBJECT_OT_empty_add);
        WM_operatortype_append(OBJECT_OT_lamp_add);
        WM_operatortype_append(OBJECT_OT_camera_add);
        WM_operatortype_append(OBJECT_OT_speaker_add);
@@ -168,6 +169,7 @@ void ED_operatortypes_object(void)
        WM_operatortype_append(CONSTRAINT_OT_childof_clear_inverse);
        WM_operatortype_append(CONSTRAINT_OT_objectsolver_set_inverse);
        WM_operatortype_append(CONSTRAINT_OT_objectsolver_clear_inverse);
+       WM_operatortype_append(CONSTRAINT_OT_followpath_path_animate);
 
        WM_operatortype_append(OBJECT_OT_vertex_group_add);
        WM_operatortype_append(OBJECT_OT_vertex_group_remove);