diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
commit | cdbfd1db3800cf4f0ea691f09bf05e78a82c80f9 (patch) | |
tree | b1f22c4ea61ff96ee51c4882047f5a8e3f08c0f1 /source/blender/editors/mesh/mesh_intern.h | |
parent | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (diff) | |
parent | 15eb3452ecd96e4d79d438e8c954918639dc283d (diff) |
Merged changes in the trunk up to revision 45820.
Conflicts resolved:
source/creator/creator.c
Diffstat (limited to 'source/blender/editors/mesh/mesh_intern.h')
-rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index a4ede97984a..33e08beeb16 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -211,7 +211,7 @@ void MESH_OT_extrude_faces_indiv(struct wmOperatorType *ot); void MESH_OT_edgering_select(struct wmOperatorType *ot); void MESH_OT_loopcut(struct wmOperatorType *ot); -void MESH_OT_knifetool(struct wmOperatorType *ot); +void MESH_OT_knife_tool(struct wmOperatorType *ot); void MESH_OT_bevel(struct wmOperatorType *ot); void MESH_OT_bridge_edge_loops(struct wmOperatorType *ot); |