diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /source/blender/editors/curve/curve_intern.h | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'source/blender/editors/curve/curve_intern.h')
| -rw-r--r-- | source/blender/editors/curve/curve_intern.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index da8f86580f6..3ee83c20852 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -118,6 +118,8 @@ void CURVE_OT_vertex_add(struct wmOperatorType *ot); void CURVE_OT_extrude(struct wmOperatorType *ot); void CURVE_OT_cyclic_toggle(struct wmOperatorType *ot); +void CURVE_OT_match_texture_space(struct wmOperatorType *ot); + /* helper functions */ void ed_editnurb_translate_flag(struct ListBase *editnurb, short flag, const float vec[3]); bool ed_editnurb_extrude_flag(struct EditNurb *editnurb, short flag); |