Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jun 2015 00:18:45 +0000 (10:18 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jun 2015 00:32:41 +0000 (10:32 +1000)
15 files changed:
source/blender/blenkernel/intern/library.c
source/blender/bmesh/intern/bmesh_core.c
source/blender/compositor/intern/COM_MemoryBuffer.cpp
source/blender/depsgraph/intern/depsgraph_build_relations.cc
source/blender/depsgraph/intern/depsgraph_eval.cc
source/blender/editors/animation/keyframing.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/mask/mask_edit.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_sequencer/sequencer_modifier.c
source/blender/makesrna/intern/rna_scene.c
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/python/mathutils/mathutils.c
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

index 39bcf519f957b6e67205c1659d2d54d65d4f22f0..b7076914ace2dd2e94365b48fa6755984589207b 100644 (file)
@@ -1423,7 +1423,7 @@ void id_clear_lib_data(Main *bmain, ID *id)
        }
 
        if (GS(id->name) == ID_OB) {
-               Object *object = (Object*)id;
+               Object *object = (Object *)id;
                if (object->proxy_from != NULL) {
                        object->proxy_from->proxy = NULL;
                        object->proxy_from->proxy_group = NULL;
index 20a88b0e17cc185115529a0dfbd525baef823f58..4c09a35bdd11911b5135ffbd35cf4fe5d5e2b9e9 100644 (file)
@@ -2457,7 +2457,7 @@ BMVert *bmesh_urmv_loop(BMesh *bm, BMLoop *l_sep)
 /**
  * A version of #bmesh_urmv_loop that disconnects multiple loops at once.
  *
- * Handles the task of finding fans boundaris.
+ * Handles the task of finding fans boundaries.
  */
 BMVert *bmesh_urmv_loop_multi(
         BMesh *bm, BMLoop **larr, int larr_len)
index 9e6e5a423f9d4620cf50b585a4b9cfbc78dff9b2..2dbf0a6aa46b8d91512fe44d90e3c2ee8357674b 100644 (file)
@@ -64,7 +64,7 @@ MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, r
        this->m_num_channels = determine_num_channels(memoryProxy->getDataType());
        this->m_buffer = (float *)MEM_mallocN_aligned(sizeof(float) * determineBufferSize() * this->m_num_channels, 16, "COM_MemoryBuffer");
        this->m_state = COM_MB_ALLOCATED;
-       this->m_datatype = memoryProxy->getDataType();;
+       this->m_datatype = memoryProxy->getDataType();
 }
 
 MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect)
index 20c059dbed6417d17b0f7b6fe0f6f2ab1653dd11..41c8054c53aa7040c9e2158b178e60444f270f83 100644 (file)
@@ -426,9 +426,9 @@ void DepsgraphRelationBuilder::build_object(Main *bmain, Scene *scene, Object *o
                                break;
                }
 
-               Key *key =BKE_key_from_object(ob);
+               Key *key = BKE_key_from_object(ob);
                if (key != NULL) {
-                       ComponentKey geometry_key((ID*)ob->data, DEPSNODE_TYPE_GEOMETRY);
+                       ComponentKey geometry_key((ID *)ob->data, DEPSNODE_TYPE_GEOMETRY);
                        ComponentKey key_key(&key->id, DEPSNODE_TYPE_GEOMETRY);
                        add_relation(key_key, geometry_key, DEPSREL_TYPE_GEOMETRY_EVAL, "Shapekeys");
                }
index 17096931e57208de6f96681a8b0c20604e29063e..0a1563e77042a6b34ace65ee090ff6fd918a1823 100644 (file)
@@ -369,7 +369,7 @@ void DEG_evaluate_on_refresh(EvaluationContext *eval_ctx,
 {
        /* Update time on primary timesource. */
        TimeSourceDepsNode *tsrc = graph->find_time_source();
-       tsrc->cfra = BKE_scene_frame_get(scene);;
+       tsrc->cfra = BKE_scene_frame_get(scene);
 
        DEG_evaluate_on_refresh_ex(eval_ctx, graph, graph->layers);
 }
index ab430483ed56ef09f8c188d5bf98cf0f7d64c4cc..85ea552690884ff4477e92cf8ab1316bdde6829a 100644 (file)
@@ -1814,8 +1814,8 @@ static int delete_key_button_exec(bContext *C, wmOperator *op)
                        
                        if (BKE_fcurve_is_protected(fcu)) {
                                BKE_reportf(op->reports, RPT_WARNING,
-                                                       "Not deleting keyframe for locked F-Curve for NLA Strip influence on %s - %s '%s'",
-                                                       strip->name, BKE_idcode_to_name(GS(id->name)), id->name + 2);
+                                           "Not deleting keyframe for locked F-Curve for NLA Strip influence on %s - %s '%s'",
+                                           strip->name, BKE_idcode_to_name(GS(id->name)), id->name + 2);
                        }
                        else {
                                /* remove the keyframe directly
index 8a6df2c1873a23720a9ccefe21f2ee62507472ba..6aabbbe76b65c6ea2139f7a15962a1028051e352 100644 (file)
@@ -1637,7 +1637,7 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle)
 }
 
 /**
- * Called for creatign new popups and refreshing existing ones.
+ * Called for creating new popups and refreshing existing ones.
  */
 uiBlock *ui_popup_block_refresh(
         bContext *C, uiPopupBlockHandle *handle,
index 38ca22a92cbdf41be12f47246d87b9cf5d46ddbf..e1a58d529b6358675f10b90e70b101982bdd0b7c 100644 (file)
@@ -409,7 +409,7 @@ bool ED_mask_selected_minmax(const bContext *C, float min[2], float max[2])
             mask_layer = mask_layer->next)
        {
                MaskSpline *spline;
-               if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW|MASK_RESTRICT_SELECT)) {
+               if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
                        continue;
                }
                for (spline = mask_layer->splines.first;
index bdf11de0f87fec867e958f2877fce229949f136a..4e550543479520f72da8085b91028eb8cd5ba105 100644 (file)
@@ -395,7 +395,7 @@ static Image *imapaint_face_image(Object *ob, Mesh *me, int face_index)
 {
        Image *ima;
        MPoly *mp = me->mpoly + face_index;
-       Material *ma = give_current_material(ob, mp->mat_nr + 1);;
+       Material *ma = give_current_material(ob, mp->mat_nr + 1);
        ima = ma && ma->texpaintslot ? ma->texpaintslot[ma->paint_active_slot].ima : NULL;
 
        return ima;
index db93000ef7c261b6171ca7f47138556b6e15a11f..8c9233e3ce5995868c4beffbe5aba11b4cfb7ab1 100644 (file)
@@ -483,17 +483,17 @@ static bool file_walk_select_selection_set(
                    filelist_is_selected(files, active_old, FILE_SEL_SELECTED) &&
                    filelist_is_selected(files, active_new, FILE_SEL_SELECTED))
                {
-                               /* conditions for deselecting: initial file is selected, new file is
-                                * selected and either other_side isn't selected/found or we use fill */
-                               deselect = (fill || other_site == -1 || !filelist_is_selected(files, other_site, FILE_SEL_SELECTED));
-
-                               /* don't change active here since we either want to deselect active or we want to
-                                * walk through a block of selected files without selecting/deselecting anything */
-                               params->active_file = active_new;
-                               /* but we want to change active if we use fill (needed to get correct selection bounds) */
-                               if (deselect && fill) {
-                                       active = active_new;
-                               }
+                       /* conditions for deselecting: initial file is selected, new file is
+                        * selected and either other_side isn't selected/found or we use fill */
+                       deselect = (fill || other_site == -1 || !filelist_is_selected(files, other_site, FILE_SEL_SELECTED));
+
+                       /* don't change active here since we either want to deselect active or we want to
+                        * walk through a block of selected files without selecting/deselecting anything */
+                       params->active_file = active_new;
+                       /* but we want to change active if we use fill (needed to get correct selection bounds) */
+                       if (deselect && fill) {
+                               active = active_new;
+                       }
                }
                else {
                        /* regular selection change */
index 76ce73b501cf9a3d559eeb6f9fda3dfaa1519680..6faf83d2a08fc2df1d2448d8391e6de8800845fc 100644 (file)
@@ -226,7 +226,7 @@ static int strip_modifier_copy_exec(bContext *C, wmOperator *UNUSED(op))
                if (seq_iter->modifiers.first) {
                        SequenceModifierData *smd_tmp, *smd = seq_iter->modifiers.first;
 
-                       while(smd) {
+                       while (smd) {
                                smd_tmp = smd->next;
                                BLI_remlink(&seq_iter->modifiers, smd);
                                BKE_sequence_modifier_free(smd);
index ea7267113279d809bff07449e31f299f06ee542a..87118e257b8cb8584daf2b583b5d70e5e1d62387 100644 (file)
@@ -1928,7 +1928,7 @@ char *rna_GPUDOF_path(PointerRNA *ptr)
                }
        }
 
-       return BLI_strdup("");;
+       return BLI_strdup("");
 }
 
 static void rna_GPUFXSettings_fx_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
index 9f6050527efa1c57543ba4a8e6a0ac184d4b1964..ff211e7906ab235539a73b2ba5d4e50d31a993cb 100644 (file)
@@ -859,7 +859,7 @@ static void cloth_collision_solve_extra(Object *ob, ClothModifierData *clmd, Lis
        Implicit_Data *id = cloth->implicit;\r
        ClothVertex *verts = cloth->verts;\r
        int numverts = cloth->numverts;\r
-       const float spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;;\r
+       const float spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;\r
        \r
        bool do_extra_solve;\r
        int i;\r
index 7b51b08451bd6c49091c57a26e7494b3a71c4100..9ec5e90a49374b8a46648d5a4f673a1253d6acf1 100644 (file)
@@ -535,7 +535,7 @@ PyObject *BaseMathObject_freeze(BaseMathObject *self)
 
        self->flag |= BASE_MATH_FLAG_IS_FROZEN;
 
-       return Py_INCREF_RET((PyObject *)self);;
+       return Py_INCREF_RET((PyObject *)self);
 }
 
 int BaseMathObject_traverse(BaseMathObject *self, visitproc visit, void *arg)
index 3670d79a01e553a2669926a1d46394b86631eadc..96505fa6e0115f41829cc15dbc151f1497589184 100644 (file)
@@ -3072,7 +3072,7 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject
 {
        Object* blenderobject = gameobj->GetBlenderObject();
 
-       bool isbulletdyna = (blenderobject->gameflag & OB_DYNAMIC) != 0;;
+       bool isbulletdyna = (blenderobject->gameflag & OB_DYNAMIC) != 0;
        bool isbulletsensor = (blenderobject->gameflag & OB_SENSOR) != 0;
        bool isbulletchar = (blenderobject->gameflag & OB_CHARACTER) != 0;
        bool isbulletsoftbody = (blenderobject->gameflag & OB_SOFT_BODY) != 0;