diff options
author | Martin Poirier <theeth@yahoo.com> | 2009-03-20 21:00:51 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2009-03-20 21:00:51 +0300 |
commit | 1af7bd439acf4dd08f7c0f66d91ef2238ff1db05 (patch) | |
tree | bd339b97d44ae35ca8a752c7989f2360a568b35b /source/blender/editors/armature/editarmature.c | |
parent | 884cfe25d34809a97e69d04c95800ae4e741259e (diff) |
merge more etch-a-ton code. nothing works, but it compiles. Will try to get it working this week end.
Diffstat (limited to 'source/blender/editors/armature/editarmature.c')
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 2aed96b61c5..3ac6f1838c1 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -75,7 +75,7 @@ #include "BIF_gl.h" #include "BIF_transform.h" -// XXX etch-a-ton #include "BIF_generate.h" +#include "BIF_generate.h" #include "RNA_access.h" #include "RNA_define.h" @@ -1762,6 +1762,8 @@ void mouse_armature(bContext *C, short mval[2], int extend) view3d_set_viewcontext(C, &vc); + BIF_sk_selectStroke(C, mval, extend); + nearBone= get_nearest_editbonepoint(&vc, mval, arm->edbo, 1, &selmask); if (nearBone) { @@ -1856,7 +1858,7 @@ void ED_armature_to_edit(Object *ob) arm->edbo= MEM_callocN(sizeof(ListBase), "edbo armature"); make_boneList(arm->edbo, &arm->bonebase,NULL); - // XXX etch-a-ton BIF_freeTemplates(); /* force template update when entering editmode */ +// BIF_freeTemplates(); /* force template update when entering editmode */ } |