diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 09:17:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 09:17:09 +0400 |
commit | ff837cbe9b2a27678a6111207ce60b64f44d5917 (patch) | |
tree | de1f188ed4d2b0659a8ebecb3a1e8b4792483065 /source/blender/editors/metaball | |
parent | c914b11614fff23bca5b601da24f02ab51b9db52 (diff) | |
parent | 4b635d16316d12dd4c57e1dcf99092551e6bbe35 (diff) |
svn merge -r41310:41329 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/metaball')
-rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 84a466a3d5b..f378fac6ac7 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -121,7 +121,7 @@ MetaElem *add_metaball_primitive(bContext *C, float mat[4][4], int type, int UNU /***************************** Select/Deselect operator *****************************/ /* Select or deselect all MetaElements */ -static int select_all_exec(bContext *C, wmOperator *op) +static int mball_select_all_exec(bContext *C, wmOperator *op) { //Scene *scene= CTX_data_scene(C); Object *obedit= CTX_data_edit_object(C); @@ -171,7 +171,7 @@ void MBALL_OT_select_all(wmOperatorType *ot) ot->idname= "MBALL_OT_select_all"; /* callback functions */ - ot->exec= select_all_exec; + ot->exec= mball_select_all_exec; ot->poll= ED_operator_editmball; /* flags */ |