svn merge ^/trunk/blender -r55815:55840
[blender-staging.git] / source / blender / editors / mesh / mesh_ops.c
index db6f6e3aeb5c1f8ad7b2e00a939f09ee215cbc28..06f920ef16c89cd38ccb903ad365d92dd4879d40 100644 (file)
@@ -106,6 +106,9 @@ void ED_operatortypes_mesh(void)
        WM_operatortype_append(MESH_OT_faces_shade_smooth);
        WM_operatortype_append(MESH_OT_faces_shade_flat);
        WM_operatortype_append(MESH_OT_sort_elements);
+#ifdef WITH_FREESTYLE
+       WM_operatortype_append(MESH_OT_mark_freestyle_face);
+#endif
 
        WM_operatortype_append(MESH_OT_delete);
        WM_operatortype_append(MESH_OT_edge_collapse);
@@ -121,6 +124,9 @@ void ED_operatortypes_mesh(void)
        WM_operatortype_append(MESH_OT_loop_multi_select);
        WM_operatortype_append(MESH_OT_mark_seam);
        WM_operatortype_append(MESH_OT_mark_sharp);
+#ifdef WITH_FREESTYLE
+       WM_operatortype_append(MESH_OT_mark_freestyle_edge);
+#endif
        WM_operatortype_append(MESH_OT_vertices_smooth);
        WM_operatortype_append(MESH_OT_vertices_smooth_laplacian);
        WM_operatortype_append(MESH_OT_noise);