From 44505b38df557a5711703613685a1dec9fc2c3d9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 4 Jun 2018 09:31:30 +0200 Subject: Cleanup: strip trailing space in editors --- source/blender/editors/metaball/mball_edit.c | 36 ++++++++++++++-------------- source/blender/editors/metaball/mball_ops.c | 12 +++++----- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'source/blender/editors/metaball') diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 27140bcdf3b..fa48462d2c7 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -19,7 +19,7 @@ * All rights reserved. * * The Original Code is: all of this file. - + * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** @@ -77,7 +77,7 @@ void ED_mball_editmball_make(Object *obedit) MetaElem *ml; /*, *newml;*/ ml = mb->elems.first; - + while (ml) { if (ml->flag & SELECT) mb->lastelem = ml; ml = ml->next; @@ -105,7 +105,7 @@ MetaElem *ED_mball_add_primitive(bContext *UNUSED(C), Object *obedit, float mat[ ml->flag &= ~SELECT; ml = ml->next; } - + ml = BKE_mball_element_add(mball, type); ml->rad *= dia; mball->wiresize *= dia; @@ -372,7 +372,7 @@ static int select_random_metaelems_exec(bContext *C, wmOperator *op) const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT); const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f; const int seed = WM_operator_properties_select_random_seed_increment_get(op); - + RNG *rng = BLI_rng_new_srandom(seed); for (ml = mb->editelems->first; ml; ml = ml->next) { @@ -387,7 +387,7 @@ static int select_random_metaelems_exec(bContext *C, wmOperator *op) BLI_rng_free(rng); WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); - + return OPERATOR_FINISHED; } @@ -398,14 +398,14 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot) ot->name = "Select Random"; ot->description = "Randomly select metaelements"; ot->idname = "MBALL_OT_select_random_metaelems"; - + /* callback functions */ ot->exec = select_random_metaelems_exec; ot->poll = ED_operator_editmball; - + /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - + /* properties */ WM_operator_properties_select_random(ot); } @@ -418,7 +418,7 @@ static int duplicate_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) Object *obedit = CTX_data_edit_object(C); MetaBall *mb = (MetaBall *)obedit->data; MetaElem *ml, *newml; - + ml = mb->editelems->last; if (ml) { while (ml) { @@ -460,7 +460,7 @@ static int delete_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) Object *obedit = CTX_data_edit_object(C); MetaBall *mb = (MetaBall *)obedit->data; MetaElem *ml, *next; - + ml = mb->editelems->first; if (ml) { while (ml) { @@ -532,7 +532,7 @@ void MBALL_OT_hide_metaelems(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - + /* props */ RNA_def_boolean(ot->srna, "unselected", false, "Unselected", "Hide unselected rather than selected"); } @@ -558,7 +558,7 @@ static int reveal_metaelems_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); DAG_id_tag_update(obedit->data, 0); } - + return OPERATOR_FINISHED; } @@ -568,11 +568,11 @@ void MBALL_OT_reveal_metaelems(wmOperatorType *ot) ot->name = "Reveal"; ot->description = "Reveal all hidden metaelements"; ot->idname = "MBALL_OT_reveal_metaelems"; - + /* callback functions */ ot->exec = reveal_metaelems_exec; ot->poll = ED_operator_editmball; - + /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -607,7 +607,7 @@ bool ED_mball_select_pick(bContext *C, const int mval[2], bool extend, bool dese } if (ml == NULL) startelem = mb->editelems->first; - + if (hits > 0) { ml = startelem; while (ml) { @@ -627,7 +627,7 @@ bool ED_mball_select_pick(bContext *C, const int mval[2], bool extend, bool dese if (ml == NULL) ml = mb->editelems->first; if (ml == startelem) break; } - + /* When some metaelem was found, then it is necessary to select or * deselect it. */ if (ml_act) { @@ -650,9 +650,9 @@ bool ED_mball_select_pick(bContext *C, const int mval[2], bool extend, bool dese /* Select only metaelem clicked on */ ml_act->flag |= SELECT; } - + mb->lastelem = ml_act; - + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); return true; diff --git a/source/blender/editors/metaball/mball_ops.c b/source/blender/editors/metaball/mball_ops.c index 6bf49187483..2e1b7299295 100644 --- a/source/blender/editors/metaball/mball_ops.c +++ b/source/blender/editors/metaball/mball_ops.c @@ -45,10 +45,10 @@ void ED_operatortypes_metaball(void) { WM_operatortype_append(MBALL_OT_delete_metaelems); WM_operatortype_append(MBALL_OT_duplicate_metaelems); - + WM_operatortype_append(MBALL_OT_hide_metaelems); WM_operatortype_append(MBALL_OT_reveal_metaelems); - + WM_operatortype_append(MBALL_OT_select_all); WM_operatortype_append(MBALL_OT_select_similar); WM_operatortype_append(MBALL_OT_select_random_metaelems); @@ -71,22 +71,22 @@ void ED_keymap_metaball(wmKeyConfig *keyconf) { wmKeyMap *keymap; wmKeyMapItem *kmi; - + keymap = WM_keymap_find(keyconf, "Metaball", 0, 0); keymap->poll = ED_operator_editmball; WM_keymap_add_item(keymap, "OBJECT_OT_metaball_add", AKEY, KM_PRESS, KM_SHIFT, 0); - + WM_keymap_add_item(keymap, "MBALL_OT_reveal_metaelems", HKEY, KM_PRESS, KM_ALT, 0); kmi = WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, 0, 0); RNA_boolean_set(kmi->ptr, "unselected", false); kmi = WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, KM_SHIFT, 0); RNA_boolean_set(kmi->ptr, "unselected", true); - + WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", XKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", DELKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MBALL_OT_duplicate_move", DKEY, KM_PRESS, KM_SHIFT, 0); - + kmi = WM_keymap_add_item(keymap, "MBALL_OT_select_all", AKEY, KM_PRESS, 0, 0); RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE); kmi = WM_keymap_add_item(keymap, "MBALL_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0); -- cgit v1.2.3