diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-10-25 09:21:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-25 09:21:17 +0400 |
commit | 4aa02d8038ccb9062b4ab522c41e54cacb0217ce (patch) | |
tree | 6ce571ca61e103ef414d49f969edeb319ea83278 | |
parent | d78899dafbcbb05196e76541b7a584c37b04a571 (diff) |
patch [#37188] Remove filename entry specified twice
from Lawrence D'Oliveiro (ldo)
-rw-r--r-- | intern/ghost/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 3873bae1eea..2cc0f476d30 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -44,7 +44,6 @@ set(SRC intern/GHOST_ISystemPaths.cpp intern/GHOST_ModifierKeys.cpp intern/GHOST_Path-api.cpp - intern/GHOST_Path-api.cpp intern/GHOST_Rect.cpp intern/GHOST_System.cpp intern/GHOST_TimerManager.cpp diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index c513b402fcd..24c46bd7966 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -209,7 +209,7 @@ static bool mball_select_similar_type(MetaBall *mb) for (ml_iter = mb->editelems->first; ml_iter; ml_iter = ml_iter->next) { if ((ml_iter->flag & SELECT) == 0) { if (ml->type == ml_iter->type) { - ml_iter->flag |=SELECT; + ml_iter->flag |= SELECT; change = true; } } @@ -311,8 +311,8 @@ static bool mball_select_similar_rotation(MetaBall *mb, const float thresh) static int mball_select_similar_exec(bContext *C, wmOperator *op) { - Object *obedit= CTX_data_edit_object(C); - MetaBall *mb = (MetaBall*)obedit->data; + Object *obedit = CTX_data_edit_object(C); + MetaBall *mb = (MetaBall *)obedit->data; int type = RNA_enum_get(op->ptr, "type"); float thresh = RNA_float_get(op->ptr, "threshold"); @@ -355,7 +355,7 @@ void MBALL_OT_select_similar(wmOperatorType *ot) ot->description = "Select similar metaballs by property types"; /* flags */ - ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ ot->prop = RNA_def_enum(ot->srna, "type", prop_similar_types, 0, "Type", ""); |