svn merge ^/trunk/blender -r55815:55840
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 6 Apr 2013 13:24:34 +0000 (13:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 6 Apr 2013 13:24:34 +0000 (13:24 +0000)
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/bmesh/CMakeLists.txt
source/blender/bmesh/intern/bmesh_operators.h
source/blender/editors/include/UI_resources.h
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/makesrna/intern/rna_internal.h
source/blender/python/bmesh/bmesh_py_types.c

index f3d113c3ae4a51e58ff542d8021a5fd0f9f09a8c,155be986ee1f7ac01e326dab92c78d9f54f567b2..be601d0b6a17736e83db0c070010dc789bf326af
@@@ -1952,12 -1952,7 +1958,13 @@@ class VIEW3D_MT_edit_mesh_faces(Menu)
  
          layout.separator()
  
 +        if context.scene and bpy.app.build_options.freestyle:
 +            layout.operator("mesh.mark_freestyle_face").clear = False
 +            layout.operator("mesh.mark_freestyle_face", text="Clear Freestyle Face").clear = True
 +
 +        layout.separator()
 +
+         layout.operator("mesh.poke")
          layout.operator("mesh.quads_convert_to_tris")
          layout.operator("mesh.tris_convert_to_quads")
  
Simple merge
index 4a0bbbb8dbf9629907a4794d42b1afe3895a00ae,937fbf8146bfd86aa15f42dad170b4451f34940c..5b447bf254f5d4f3977839cffc28928ef5ff0ab2
@@@ -202,11 -202,8 +202,12 @@@ void MESH_OT_edge_face_add(struct wmOpe
  void MESH_OT_duplicate(struct wmOperatorType *ot);
  void MESH_OT_merge(struct wmOperatorType *ot);
  void MESH_OT_remove_doubles(struct wmOperatorType *ot);
+ void MESH_OT_poke(struct wmOperatorType *ot);
  
 +#ifdef WITH_FREESTYLE
 +void MESH_OT_mark_freestyle_edge(struct wmOperatorType *ot);
 +void MESH_OT_mark_freestyle_face(struct wmOperatorType *ot);
 +#endif
  
  /* *** mesh_data.c *** */
  void MESH_OT_uv_texture_add(struct wmOperatorType *ot);