patch [#37188] Remove filename entry specified twice
authorCampbell Barton <ideasman42@gmail.com>
Fri, 25 Oct 2013 05:21:17 +0000 (05:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 25 Oct 2013 05:21:17 +0000 (05:21 +0000)
from Lawrence D'Oliveiro (ldo)

intern/ghost/CMakeLists.txt
source/blender/editors/metaball/mball_edit.c

index 3873bae1eea0777e609bc50d035631d5c7af10db..2cc0f476d305de9757fdb783fca8dc176b8c9f66 100644 (file)
@@ -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
index c513b402fcd3ba90d32ecfc940ea6a98c36a3de9..24c46bd7966b6cf93b94aca6efc49785e7412b7d 100644 (file)
@@ -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", "");