Style Cleanup: whitespace
authorCampbell Barton <ideasman42@gmail.com>
Sun, 12 Jan 2014 11:05:24 +0000 (22:05 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 12 Jan 2014 11:05:24 +0000 (22:05 +1100)
31 files changed:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/mask_rasterize.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/pbvh_bmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenkernel/tracking_private.h
source/blender/blenlib/intern/string_utf8.c
source/blender/bmesh/intern/bmesh_marking.c
source/blender/bmesh/intern/bmesh_walkers_impl.c
source/blender/bmesh/tools/bmesh_bevel.c
source/blender/bmesh/tools/bmesh_bisect_plane.c
source/blender/bmesh/tools/bmesh_edgenet.c
source/blender/bmesh/tools/bmesh_edgesplit.c
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/view2d.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_constraint.c
source/blender/editors/render/render_preview.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_node/node_select.c
source/blender/editors/transform/transform.c
source/blender/editors/util/undo.c
source/blender/imbuf/intern/cineon/dpxlib.c
source/blender/makesrna/intern/rna_tracking.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/python/bmesh/bmesh_py_ops_call.c

index 8796bd54bd3ec128eeeb30de6c37d616bf06223f..ee7d89071d3715e9b7fe90765ef5031178b06af1 100644 (file)
@@ -1571,7 +1571,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
                        continue;
                }
                if (sculpt_mode &&
-                       (!has_multires || multires_applied || ob->sculpt->bm))
+                   (!has_multires || multires_applied || ob->sculpt->bm))
                {
                        int unsupported = 0;
 
index 32914dedde19ee63cbd962924e59d1ed2755d12c..712f79c40a79c89dd488a009e02910b562d077d6 100644 (file)
@@ -429,7 +429,7 @@ static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges
        int i;
 
        if (cddm->pbvh && cddm->pbvh_draw &&
-               BKE_pbvh_type(cddm->pbvh) == PBVH_BMESH)
+           BKE_pbvh_type(cddm->pbvh) == PBVH_BMESH)
        {
                BKE_pbvh_draw(cddm->pbvh, NULL, NULL, NULL, TRUE);
 
index ce42d6abc3375b27c5d0c7a75cec90f7ecd5f6e9..546c3f9e94b7e937d03fea3939f89c09509389e7 100644 (file)
@@ -350,8 +350,8 @@ static int layer_bucket_isect_test(MaskRasterLayer *layer, unsigned int face_ind
                }
                else {
                        if ((dist_squared_to_line_segment_v2(cent, v1, v2) < bucket_max_rad_squared) ||
-                               (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
-                               (dist_squared_to_line_segment_v2(cent, v3, v1) < bucket_max_rad_squared))
+                           (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
+                           (dist_squared_to_line_segment_v2(cent, v3, v1) < bucket_max_rad_squared))
                        {
                                return TRUE;
                        }
index 694c835d62f7636c48abeeb0a7f9fda52ddcc6b0..b2738f5c7f058c0ea461028d284ebf424651ef4d 100644 (file)
@@ -1997,7 +1997,7 @@ int BKE_mesh_mselect_find(Mesh *me, int index, int type)
 
        for (i = 0; i < me->totselect; i++) {
                if ((me->mselect[i].index == index) &&
-                       (me->mselect[i].type == type))
+                   (me->mselect[i].type == type))
                {
                        return i;
                }
index bfde9a9d7748a4e7ceca53874ccbf14a3e28269c..3596ad981f68ba1daa51949dfabd8842ac61c16b 100644 (file)
@@ -605,7 +605,7 @@ static void long_edge_queue_create(EdgeQueueContext *eq_ctx,
 
                /* Check leaf nodes marked for topology update */
                if ((node->flag & PBVH_Leaf) &&
-                       (node->flag & PBVH_UpdateTopology))
+                   (node->flag & PBVH_UpdateTopology))
                {
                        GHashIterator gh_iter;
 
@@ -644,7 +644,7 @@ static void short_edge_queue_create(EdgeQueueContext *eq_ctx,
 
                /* Check leaf nodes marked for topology update */
                if ((node->flag & PBVH_Leaf) &&
-                       (node->flag & PBVH_UpdateTopology))
+                   (node->flag & PBVH_UpdateTopology))
                {
                        GHashIterator gh_iter;
 
@@ -747,7 +747,7 @@ static void pbvh_bmesh_split_edge(EdgeQueueContext *eq_ctx, PBVH *bvh,
 
                /* Ensure new vertex is in the node */
                if (!BLI_gset_haskey(bvh->nodes[ni].bm_unique_verts, v_new) &&
-                       !BLI_gset_haskey(bvh->nodes[ni].bm_other_verts, v_new))
+                   !BLI_gset_haskey(bvh->nodes[ni].bm_other_verts, v_new))
                {
                        BLI_gset_insert(bvh->nodes[ni].bm_other_verts, v_new);
                }
@@ -788,7 +788,7 @@ static int pbvh_bmesh_subdivide_long_edges(EdgeQueueContext *eq_ctx, PBVH *bvh,
                 * and the node has been split, thus leaving wire edges and
                 * associated vertices. */
                if (!BLI_ghash_haskey(bvh->bm_vert_to_node, e->v1) ||
-                       !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
+                   !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
                {
                        continue;
                }
@@ -974,7 +974,7 @@ static int pbvh_bmesh_collapse_short_edges(EdgeQueueContext *eq_ctx,
                 * and the node has been split, thus leaving wire edges and
                 * associated vertices. */
                if (!BLI_ghash_haskey(bvh->bm_vert_to_node, e->v1) ||
-                       !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
+                   !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
                {
                        continue;
                }
@@ -1145,7 +1145,7 @@ int BKE_pbvh_bmesh_update_topology(PBVH *bvh, PBVHTopologyUpdateMode mode,
                PBVHNode *node = &bvh->nodes[n];
 
                if (node->flag & PBVH_Leaf &&
-                       node->flag & PBVH_UpdateTopology)
+                   node->flag & PBVH_UpdateTopology)
                {
                        node->flag &= ~PBVH_UpdateTopology;
                }
index 188c80e7cc8ffc10f856594045c7d1d570c4f702..2d23c32720bd6f11a38bdab0f12597f906eb0010 100644 (file)
@@ -142,8 +142,7 @@ static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels,
                ccgSubSurf_getUseAgeCounts(prevSS, &oldUseAging, NULL, NULL, NULL);
 
                if ((oldUseAging != useAging) ||
-                       (ccgSubSurf_getSimpleSubdiv(prevSS) !=
-                        !!(flags & CCG_SIMPLE_SUBDIV)))
+                   (ccgSubSurf_getSimpleSubdiv(prevSS) != !!(flags & CCG_SIMPLE_SUBDIV)))
                {
                        ccgSubSurf_free(prevSS);
                }
index 9d6c901c678b226fe518883dd678e9a195e86899..3245fe5fbd5da356be4b0c7df1b5fad31b1ce46a 100644 (file)
@@ -32,8 +32,8 @@
  * by multiple tracking files but which should not be public.
  */
 
-#ifndef __TRACKING_PRIVATE__
-#define __TRACKING_PRIVATE__
+#ifndef __TRACKING_PRIVATE_H__
+#define __TRACKING_PRIVATE_H__
 
 struct GHash;
 struct MovieTracking;
@@ -81,4 +81,4 @@ void tracking_set_marker_coords_from_tracking(int frame_width, int frame_height,
 void tracking_marker_insert_disabled(struct MovieTrackingTrack *track, const struct MovieTrackingMarker *ref_marker,
                                      bool before, bool overwrite);
 
-#endif  /* __TRACKING_PRIVATE__ */
+#endif  /* __TRACKING_PRIVATE_H__ */
index e565d6e001c16a0830ddcb6659273df84caf1868..e7beaaa33a08255de79e07607ebb3222b6b0597c 100644 (file)
@@ -115,7 +115,7 @@ int BLI_utf8_invalid_byte(const char *str, int length)
                         * and then for 1111 1100, xx00 00xx */
                case 5:
                        if (c == 0xfe || c == 0xff ||
-                               (c == 0xfc && (*p & 0x3c) == 0)) goto utf8_error;
+                           (c == 0xfc && (*p & 0x3c) == 0)) goto utf8_error;
                        break;
                }
 
index 0a6c0f4b2934d89961fd8e791f1188b35c71c4cf..2f05d901d27f6d6dc84d1821761e7499c077b21f 100644 (file)
@@ -167,8 +167,8 @@ void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode)
                        {
                                BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
                                        if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
-                                               BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
-                                               !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+                                           BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
+                                           !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
                                        {
                                                BM_elem_flag_enable(e, BM_ELEM_SELECT);
                                        }
index aca2f96dc18793ce1b13659678667dde922c174e..4cf252e76e8ca009aaaf9d033816b763b8de5f54 100644 (file)
@@ -641,12 +641,12 @@ static void *bmw_LoopWalker_step(BMWalker *walker)
 
                /* check if we should step, this is fairly involved */
                if (
-                       /* walk over boundary of faces but stop at corners */
-                       (owalk.is_single == false && vert_edge_tot > 2) ||
+                   /* walk over boundary of faces but stop at corners */
+                   (owalk.is_single == false && vert_edge_tot > 2) ||
 
-                       /* initial edge was a boundary, so is this edge and vertex is only apart of this face
-                        * this lets us walk over the the boundary of an ngon which is handy */
-                       (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e)))
+                   /* initial edge was a boundary, so is this edge and vertex is only apart of this face
+                   * this lets us walk over the the boundary of an ngon which is handy */
+                   (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e)))
                {
                        /* find next boundary edge in the fan */
                        do {
@@ -932,7 +932,7 @@ static void *bmw_EdgeringWalker_step(BMWalker *walker)
        }
 
        if ((len <= 0) || (len % 2 != 0) || !EDGE_CHECK(l->e) ||
-               !bmw_mask_check_face(walker, l->f))
+           !bmw_mask_check_face(walker, l->f))
        {
                l = owalk.l;
                i = len;
index 0024e17f974fb022b793f47a443931d7b53d9534..71bb583435170a07add120e86e9600259e3b1a13 100644 (file)
@@ -2436,7 +2436,7 @@ static bool tri_corner_test(BevelParams *bp, BevVert *bv)
                totang += ang;
        }
        angdiff = fabsf(totang - 3.0f * (float)M_PI_2);
-       if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI/16.0f) ||
+       if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI / 16.0f) ||
            (angdiff > (float)M_PI_4))
        {
                return false;
index 7001cfa40619b6ccf634e0d54e3583c62e10cd9b..7a33dc40f8e9c12dc0067f3c053ff43d0ce1d30a 100644 (file)
@@ -248,7 +248,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
                                                /* would be nice to avoid loop lookup here,
                                                 * but we need to know which face the verts are in */
                                                if ((l_a = BM_face_vert_share_loop(face_split_arr[j], v_a)) &&
-                                                       (l_b = BM_face_vert_share_loop(face_split_arr[j], v_b)))
+                                                   (l_b = BM_face_vert_share_loop(face_split_arr[j], v_b)))
                                                {
                                                        found = true;
                                                        break;
index 14d474fed61add97f5f13b2d4b619b4916ca8d45..3b70d0e6406ecd485112fd6f496620d4282c7ccf 100644 (file)
@@ -221,7 +221,7 @@ static BMEdge *bm_edgenet_path_step(
 
                                        if (vn_curr->pass == -vn_next->pass) {
                                                if ((vn_curr->flag & VNINFO_FLAG_IS_MIXFACE) ||
-                                                       (vn_next->flag & VNINFO_FLAG_IS_MIXFACE))
+                                                   (vn_next->flag & VNINFO_FLAG_IS_MIXFACE))
                                                {
                                                        /* found connecting edge */
                                                        if (bm_edgenet_path_check_overlap(v_curr, v_next, vnet_info) == false) {
@@ -237,8 +237,8 @@ static BMEdge *bm_edgenet_path_step(
                                                /* flush flag down the path */
                                                vn_next->flag &= ~VNINFO_FLAG_IS_MIXFACE;
                                                if ((vn_curr->flag & VNINFO_FLAG_IS_MIXFACE) ||
-                                                       (vn_next->face == -1) ||
-                                                       (vn_next->face != vn_curr->face))
+                                                   (vn_next->face == -1) ||
+                                                   (vn_next->face != vn_curr->face))
                                                {
                                                        vn_next->flag |= VNINFO_FLAG_IS_MIXFACE;
                                                }
index 412253aafe929c7451d9b4c316cd396db5f914d4..947b77675d83a23f1c6a06646a166060da11b091 100644 (file)
@@ -88,7 +88,7 @@ static void bm_edgesplit_validate_seams(BMesh *bm)
        BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
                if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
                        if (vtouch[BM_elem_index_get(e->v1)] == 1 &&
-                               vtouch[BM_elem_index_get(e->v2)] == 1)
+                           vtouch[BM_elem_index_get(e->v2)] == 1)
                        {
                                BM_elem_flag_disable(e, BM_ELEM_TAG);
                        }
index b82142a33e65f0028e917a20643f18105a3c69f1..17d26f4d96cf717b7e23576acecec7679ab9f0ff 100644 (file)
@@ -6085,8 +6085,8 @@ static int curve_delete_segments(Object *obedit, const bool split)
                                                bezt2 = &nu->bezt[nu->pntsu - 2];
 
                                                if ((nu->flagu & CU_NURB_CYCLIC) &&
-                                                       BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
-                                                       BEZSELECTED_HIDDENHANDLES(cu, bezt2))
+                                                   BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
+                                                   BEZSELECTED_HIDDENHANDLES(cu, bezt2))
                                                {
                                                        /* check if need to join start of spline to end */
                                                        nu1 = BKE_nurb_copy(nu, cut + 1, 1);
@@ -6107,8 +6107,8 @@ static int curve_delete_segments(Object *obedit, const bool split)
                                                bezt2 = &nu->bezt[1];
 
                                                if ((nu->flagu & CU_NURB_CYCLIC) &&
-                                                       BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
-                                                       BEZSELECTED_HIDDENHANDLES(cu, bezt2))
+                                                   BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
+                                                   BEZSELECTED_HIDDENHANDLES(cu, bezt2))
                                                {
                                                        /* check if need to join start of spline to end */
                                                        nu1 = BKE_nurb_copy(nu, cut + 1, 1);
index f235ef412bacd5165c9714da51f27281ad6a96e8..09cfcf5256f0c112be9bd1c00b4742c99bc447c0 100644 (file)
@@ -1195,14 +1195,14 @@ static void gp_stroke_to_bezier(bContext *C, bGPDlayer *gpl, bGPDstroke *gps, Cu
                        interp_v3_v3v3(h2, p1, p2, BEZT_HANDLE_FAC);
                        bezt++;
                        gp_stroke_to_bezier_add_point(gtd, bezt, p1, h1, h2, (bezt - 1)->vec[1], do_gtd, gps->prev->inittime, dt1,
-                                          0.0f, rad_fac, minmax_weights);
+                                                     0.0f, rad_fac, minmax_weights);
 
                        /* Second point */
                        interp_v3_v3v3(h1, p2, p1, BEZT_HANDLE_FAC);
                        interp_v3_v3v3(h2, p2, p3d_cur, BEZT_HANDLE_FAC);
                        bezt++;
                        gp_stroke_to_bezier_add_point(gtd, bezt, p2, h1, h2, p1, do_gtd, gps->inittime, dt2,
-                                          0.0f, rad_fac, minmax_weights);
+                                                     0.0f, rad_fac, minmax_weights);
 
                        old_nbezt += 2;
                        copy_v3_v3(p3d_prev, p2);
index 79ae8536acc75fcd9f2862134054eca9d405bfca..ae456669257197611f8bcd14a965ec946f0a5103 100644 (file)
@@ -6964,7 +6964,7 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar)
 
                                        for (i = 0; i < len; i++) {
                                                if (!dyn_data->items_filter_flags ||
-                                                       ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
+                                                   ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
                                                {
                                                        org_order[new_order ? new_order[++org_idx] : ++org_idx] = i;
                                                        if (i == value) {
index 92a621387a81966ba16de79e9556b34495cd71f1..c7de757e2c98ec57a913179eaa3746f0fcb44a8a 100644 (file)
@@ -2842,7 +2842,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
                        RNA_PROP_BEGIN (dataptr, itemptr, prop)
                        {
                                if (!dyn_data->items_filter_flags ||
-                                       ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
+                                   ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
                                {
                                        int ii;
                                        if (dyn_data->items_filter_neworder) {
index e59106c265ae35b0ab4d51bd045a4bf7dc7a7f6f..f74e7dc0a1d63b04332d5aea59525323c380eb75 100644 (file)
@@ -1656,8 +1656,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
                 *              and only the time-grids with their zoomability can do so)
                 */
                if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0 &&
-                       (v2d->scroll & V2D_SCROLL_SCALE_HORIZONTAL) &&
-                       (BLI_rcti_size_x(&slider) > V2D_SCROLLER_HANDLE_SIZE))
+                   (v2d->scroll & V2D_SCROLL_SCALE_HORIZONTAL) &&
+                   (BLI_rcti_size_x(&slider) > V2D_SCROLLER_HANDLE_SIZE))
                {
                        state |= UI_SCROLL_ARROWS;
                }
@@ -1768,8 +1768,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
                 *              and only the time-grids with their zoomability can do so)
                 */
                if ((v2d->keepzoom & V2D_LOCKZOOM_Y) == 0 &&
-                       (v2d->scroll & V2D_SCROLL_SCALE_VERTICAL) &&
-                       (BLI_rcti_size_y(&slider) > V2D_SCROLLER_HANDLE_SIZE))
+                   (v2d->scroll & V2D_SCROLL_SCALE_VERTICAL) &&
+                   (BLI_rcti_size_y(&slider) > V2D_SCROLLER_HANDLE_SIZE))
                {
                        state |= UI_SCROLL_ARROWS;
                }
index 6decec75de4469cb9388fcc6614e79ab057b8a3c..83947534d06662e4500d96068185f0d6a7a2118c 100644 (file)
@@ -756,7 +756,7 @@ static int mesh_customdata_clear_mask_exec(bContext *C, wmOperator *UNUSED(op))
        int ret_b = mesh_customdata_clear_exec__internal(C, BM_LOOP, CD_GRID_PAINT_MASK);
 
        if (ret_a == OPERATOR_FINISHED ||
-               ret_b == OPERATOR_FINISHED)
+           ret_b == OPERATOR_FINISHED)
        {
                return OPERATOR_FINISHED;
        }
index d4fac49e9733b14e5a013bb83dcdaf9e0f165056..e9e7dd282a6ece389ca726a382474b28f63a48f9 100644 (file)
@@ -927,8 +927,8 @@ static int followpath_path_animate_exec(bContext *C, wmOperator *op)
        if (data->tar) {
                Curve *cu = (Curve *)data->tar->data;
                
-               if ( ELEM(NULL, cu->adt, cu->adt->action) ||
-                       (list_find_fcurve(&cu->adt->action->curves, "eval_time", 0) == NULL))
+               if (ELEM(NULL, cu->adt, cu->adt->action) ||
+                   (list_find_fcurve(&cu->adt->action->curves, "eval_time", 0) == NULL))
                {
                        /* create F-Curve for path animation */
                        act = verify_adt_action(&cu->id, 1);
index 3f507cd5020198973dd909fc60b2b6360939efb5..f0507abaf9556367270fa6d9b2cb1b030b24a577 100644 (file)
@@ -614,7 +614,7 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, r
                 * or if the job is running and the size of preview changed */
                if ((sbuts->spacetype == SPACE_BUTS && sbuts->preview) ||
                    (!ok && !WM_jobs_test(wm, sa, WM_JOB_TYPE_RENDER_PREVIEW)) ||
-                       (sp && (ABS(sp->sizex - newx) >= 2 || ABS(sp->sizey - newy) > 2)))
+                   (sp && (ABS(sp->sizex - newx) >= 2 || ABS(sp->sizey - newy) > 2)))
                {
                        sbuts->preview = 0;
                        ED_preview_shader_job(C, sa, id, parent, slot, newx, newy, PR_BUTS_RENDER);
index 78af1bea8bc3d10df985b2526ab802abf3f4d38e..00ae9f7a1c033e0636c98bf2f3c838ed58afdeaa 100644 (file)
@@ -545,7 +545,7 @@ static void paint_draw_tex_overlay(UnifiedPaintSettings *ups, Brush *brush,
 
        if (!(mtex->tex) || !((mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) ||
            (valid &&
-               ELEM(mtex->brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED))))
+           ELEM(mtex->brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED))))
        {
                return;
        }
index 24093a4aa571d99f12e8ede788281985f89c236b..8c3024ee07274b59b2d638b9119419070d7f6ac0 100644 (file)
@@ -3110,7 +3110,7 @@ static void sculpt_topology_update(Sculpt *sd, Object *ob, Brush *brush)
                        mode |= PBVH_Subdivide;
 
                if ((sd->flags & SCULPT_DYNTOPO_COLLAPSE) ||
-                       (brush->sculpt_tool == SCULPT_TOOL_SIMPLIFY))
+                   (brush->sculpt_tool == SCULPT_TOOL_SIMPLIFY))
                {
                        mode |= PBVH_Collapse;
                }
index 64326bd799310c3c6280e8d98efb310b540807e0..de0665e13b19d273718d5e95931994654948f0a3 100644 (file)
@@ -598,7 +598,7 @@ static bool do_lasso_select_node(bContext *C, const int mcords[][2], short moves
                                         &screen_co[0], &screen_co[1]);
 
                if (BLI_rcti_isect_pt(&rect, screen_co[0], screen_co[1]) &&
-                       BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], INT_MAX))
+                   BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], INT_MAX))
                {
                        nodeSetSelected(node, select);
                        changed = true;
index 825a8c973a253aac0656e5346ddcf2b1f397127c..2fa28b34d139b25e18dfca75f2cd7f726fbbb1ee 100644 (file)
@@ -1891,7 +1891,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
                /* skip saving proportional edit if it was not actually used */
                if (!(t->options & CTX_NO_PET)) {
                        if ((prop = RNA_struct_find_property(op->ptr, "proportional")) &&
-                               !RNA_property_is_set(op->ptr, prop))
+                           !RNA_property_is_set(op->ptr, prop))
                        {
                                if (t->obedit)
                                        ts->proportional = proportional;
@@ -1902,13 +1902,13 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
                        }
 
                        if ((prop = RNA_struct_find_property(op->ptr, "proportional_size")) &&
-                               !RNA_property_is_set(op->ptr, prop))
+                           !RNA_property_is_set(op->ptr, prop))
                        {
                                ts->proportional_size = t->prop_size;
                        }
 
                        if ((prop = RNA_struct_find_property(op->ptr, "proportional_edit_falloff")) &&
-                               !RNA_property_is_set(op->ptr, prop))
+                           !RNA_property_is_set(op->ptr, prop))
                        {
                                ts->prop_mode = t->prop_mode;
                        }
@@ -5323,7 +5323,7 @@ static bool createEdgeSlideVerts(TransInfo *t)
 
        if ((t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) &&
            /* don't do this at all for non-basis shape keys, too easy to
-                * accidentally break uv maps or vertex colors then */
+            * accidentally break uv maps or vertex colors then */
            (bm->shapenr <= 1))
        {
                sld->use_origfaces = true;
index e285fd8bea440f6dd550ade7b17be68b3edbe90b..6d3d33f189749dec7ed9a80aea9a4a548024cdd8 100644 (file)
@@ -358,14 +358,14 @@ int ED_undo_operator_repeat(bContext *C, struct wmOperator *op)
                if (ar1)
                        CTX_wm_region_set(C, ar1);
 
-               if ( (WM_operator_repeat_check(C, op)) &&
-                    (WM_operator_poll(C, op->type)) &&
+               if ((WM_operator_repeat_check(C, op)) &&
+                   (WM_operator_poll(C, op->type)) &&
                     /* note, undo/redo cant run if there are jobs active,
                      * check for screen jobs only so jobs like material/texture/world preview
                      * (which copy their data), wont stop redo, see [#29579]],
                      *
                      * note, - WM_operator_check_ui_enabled() jobs test _must_ stay in sync with this */
-                    (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY) == 0))
+                   (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY) == 0))
                {
                        int retval;
 
index e839c2fce907162b17af83bfe24fc1bc5b7accf9..ff7d37893c7332f8cc0e4844fd9e68af67ac61ae 100644 (file)
@@ -256,8 +256,8 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf
 
                dpx->element[i].bitsPerSample = header.imageHeader.element[i].bits_per_sample;
                if (dpx->element[i].bitsPerSample != 1 && dpx->element[i].bitsPerSample != 8 &&
-                       dpx->element[i].bitsPerSample != 10 && dpx->element[i].bitsPerSample != 12 &&
-                       dpx->element[i].bitsPerSample != 16)
+                   dpx->element[i].bitsPerSample != 10 && dpx->element[i].bitsPerSample != 12 &&
+                   dpx->element[i].bitsPerSample != 16)
                {
                        if (verbose) printf("DPX: Unsupported bitsPerSample for elements %d: %d\n", i, dpx->element[i].bitsPerSample);
                        logImageClose(dpx);
index 750249519024e2e2d71a01d3b607cfa285209665..4aab1656f19f217142f87eefc1584050bea1b154 100644 (file)
@@ -242,8 +242,8 @@ static void rna_trackingPlaneMarker_frame_set(PointerRNA *ptr, int value)
                ListBase *tracksbase = BKE_tracking_object_get_plane_tracks(tracking, tracking_object);
 
                for (plane_track = tracksbase->first;
-                        plane_track;
-                        plane_track = plane_track->next)
+                    plane_track;
+                    plane_track = plane_track->next)
                {
                        if (plane_marker >= plane_track->markers && plane_marker < plane_track->markers + plane_track->markersnr) {
                                found = true;
@@ -479,8 +479,8 @@ static void rna_trackingMarker_frame_set(PointerRNA *ptr, int value)
                ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
 
                for (track = tracksbase->first;
-                        track;
-                        track = track->next)
+                    track;
+                    track = track->next)
                {
                        if (marker >= track->markers && marker < track->markers + track->markersnr) {
                                found = true;
index a493db139a0dc143171da020c2baf3504b9fc905..b8f590c0e961449d76aa18fe2cda81ea58dd42eb 100644 (file)
@@ -300,7 +300,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
                        /* get particle state */
                        if ((psys->flag & (PSYS_HAIR_DONE | PSYS_KEYED) || psys->pointcache->flag & PTCACHE_BAKED) &&
-                               (pimd->flag & eParticleInstanceFlag_Path))
+                           (pimd->flag & eParticleInstanceFlag_Path))
                        {
                                float ran = 0.0f;
                                if (pimd->random_position != 0.0f) {
index 5b3eabe5ca4ef21ca3e68633aa0286a78349b8b2..eef2e14773664d358de67845e7f6fd5761aa8fa0 100644 (file)
@@ -690,8 +690,7 @@ PyObject *BPy_BMO_call(BPy_BMeshOpFunc *self, PyObject *args, PyObject *kw)
 
        if ((PyTuple_GET_SIZE(args) == 1) &&
            (py_bm = (BPy_BMesh *)PyTuple_GET_ITEM(args, 0)) &&
-           (BPy_BMesh_Check(py_bm))
-               )
+           (BPy_BMesh_Check(py_bm)))
        {
                BPY_BM_CHECK_OBJ(py_bm);
                bm = py_bm->bm;