svn merge ^/trunk/blender -r41226:41227 .
[blender.git] / source / blender / editors / mesh / mesh_ops.c
index 82d925c4ff3a2f4c430170a506a415aada0e48ac..83abfc9d7b9502941e8986a7f33347a3022e5067 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -119,7 +117,7 @@ void ED_operatortypes_mesh(void)
        WM_operatortype_append(MESH_OT_edge_flip);
        WM_operatortype_append(MESH_OT_faces_shade_smooth);
        WM_operatortype_append(MESH_OT_faces_shade_flat);
-       //WM_operatortype_append(MESH_OT_sort_faces);
+       WM_operatortype_append(MESH_OT_sort_faces);
 
        WM_operatortype_append(MESH_OT_delete);
 
@@ -161,6 +159,15 @@ void ED_operatortypes_mesh(void)
        WM_operatortype_append(MESH_OT_select_next_loop);
        
        WM_operatortype_append(EXPORT_MESH_OT_wavefront);
+       WM_operatortype_append(MESH_OT_bridge_edge_loops);
+
+#ifdef WITH_GAMEENGINE
+       WM_operatortype_append(MESH_OT_navmesh_make);
+       WM_operatortype_append(MESH_OT_navmesh_face_copy);
+       WM_operatortype_append(MESH_OT_navmesh_face_add);
+       WM_operatortype_append(MESH_OT_navmesh_reset);
+       WM_operatortype_append(MESH_OT_navmesh_clear);
+#endif
 }
 
 #if 0 /* UNUSED, remove? */