Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Oct 2017 05:56:41 +0000 (16:56 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Oct 2017 05:56:41 +0000 (16:56 +1100)
14 files changed:
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/intern/noise.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/render/render_internal.c
source/blender/editors/screen/screen_context.c
source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_image/image_ops.c
source/blender/python/generic/bgl.c

index ee0f904..310255a 100644 (file)
@@ -1380,7 +1380,7 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, const ColorManagedViewSettings *
 
        /* Keep number of threads in sync with the merge parts below. */
        ScopesUpdateData data = {
-               .scopes = scopes, . ibuf = ibuf,
+               .scopes = scopes, .ibuf = ibuf,
                .cm_processor = cm_processor, .display_buffer = display_buffer, .ycc_mode = ycc_mode,
                .bin_lum = bin_lum, .bin_r = bin_r, .bin_g = bin_g, .bin_b = bin_b, .bin_a = bin_a,
        };
index 90f2fe3..54f0923 100644 (file)
@@ -1454,8 +1454,7 @@ static bool do_add_image_extension(char *string, const char imtype, const ImageF
        if (extension) {
                /* prefer this in many cases to avoid .png.tga, but in certain cases it breaks */
                /* remove any other known image extension */
-               if (BLI_testextensie_array(string, imb_ext_image))
-               {
+               if (BLI_testextensie_array(string, imb_ext_image)) {
                        return BLI_replace_extension(string, FILE_MAX, extension);
                }
                else {
index 9b6c5f0..d739f80 100644 (file)
@@ -607,7 +607,8 @@ void BKE_pbvh_build_grids(PBVH *bvh, CCGElem **grids,
        MEM_freeN(prim_bbc);
 }
 
-void BKE_pbvh_set_ccgdm(PBVH *bvh, CCGDerivedMesh *ccgdm) {
+void BKE_pbvh_set_ccgdm(PBVH *bvh, CCGDerivedMesh *ccgdm)
+{
        bvh->ccgdm = ccgdm;
 }
 
@@ -1334,7 +1335,8 @@ void BKE_pbvh_get_grid_key(const PBVH *bvh, CCGKey *key)
        *key = bvh->gridkey;
 }
 
-CCGDerivedMesh *BKE_pbvh_get_ccgdm(const PBVH *bvh) {
+CCGDerivedMesh *BKE_pbvh_get_ccgdm(const PBVH *bvh)
+{
        return bvh->ccgdm;
 }
 
index c0dcac3..d32a3a2 100644 (file)
@@ -2371,7 +2371,7 @@ int BKE_scene_num_threads(const Scene *scene)
 int BKE_render_preview_pixel_size(const RenderData *r)
 {
        if (r->preview_pixel_size == 0) {
-               return (U.pixelsize > 1.5f)? 2 : 1;
+               return (U.pixelsize > 1.5f) ? 2 : 1;
        }
        return r->preview_pixel_size;
 }
index 86c2430..8301269 100644 (file)
@@ -1395,9 +1395,9 @@ static float voronoi_CrS(float x, float y, float z)
 static float cellNoiseU(float x, float y, float z)
 {
        /* avoid precision issues on unit coordinates */
-       x = (x + 0.000001f)*1.00001f;
-       y = (y + 0.000001f)*1.00001f;
-       z = (z + 0.000001f)*1.00001f;
+       x = (x + 0.000001f) * 1.00001f;
+       y = (y + 0.000001f) * 1.00001f;
+       z = (z + 0.000001f) * 1.00001f;
 
        int xi = (int)(floor(x));
        int yi = (int)(floor(y));
@@ -1417,9 +1417,9 @@ float cellNoise(float x, float y, float z)
 void cellNoiseV(float x, float y, float z, float ca[3])
 {
        /* avoid precision issues on unit coordinates */
-       x = (x + 0.000001f)*1.00001f;
-       y = (y + 0.000001f)*1.00001f;
-       z = (z + 0.000001f)*1.00001f;
+       x = (x + 0.000001f) * 1.00001f;
+       y = (y + 0.000001f) * 1.00001f;
+       z = (z + 0.000001f) * 1.00001f;
 
        int xi = (int)(floor(x));
        int yi = (int)(floor(y));
index 08e8d90..6c863ea 100644 (file)
@@ -1677,7 +1677,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
                /* Fix for invalid state of screen due to bug in older versions. */
                for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) {
                        for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
-                               if(sa->full && sc->state == SCREENNORMAL) {
+                               if (sa->full && sc->state == SCREENNORMAL) {
                                        sa->full = NULL;
                                }
                        }
index af414f7..f7dfb4b 100644 (file)
@@ -9249,7 +9249,8 @@ static int ui_handle_menu_event(
                                                                      UI_BTYPE_BUT_MENU,
                                                                      UI_BTYPE_MENU, UI_BTYPE_BLOCK,
                                                                      UI_BTYPE_PULLDOWN) &&
-                                                                count == act) {
+                                                                count == act)
+                                                       {
                                                                doit = true;
                                                        }
 
@@ -10228,9 +10229,9 @@ void UI_popup_handlers_remove(ListBase *handlers, uiPopupBlockHandle *popup)
                    handler->ui_userdata == popup)
                {
                        /* tag refresh parent popup */
-                       if (handler->next && 
-                               handler->next->ui_handle == ui_popup_handler && 
-                               handler->next->ui_remove == ui_popup_handler_remove) 
+                       if (handler->next &&
+                           handler->next->ui_handle == ui_popup_handler &&
+                           handler->next->ui_remove == ui_popup_handler_remove)
                        {
                                uiPopupBlockHandle *parent_popup = handler->next->ui_userdata;
                                ED_region_tag_refresh_ui(parent_popup->region);
index 26c863d..ff64476 100644 (file)
@@ -1317,7 +1317,7 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda
                                if (restore)
                                        RE_DataBase_IncrementalView(re, rp->viewmat, 1);
 
-                               rp->resolution_divider = MAX2(rp->resolution_divider/2, pixel_size);
+                               rp->resolution_divider = MAX2(rp->resolution_divider / 2, pixel_size);
                                *do_update = 1;
 
                                render_update_resolution(re, rp, use_border, &cliprct);
index 293e507..1190423 100644 (file)
@@ -609,8 +609,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
                        return 1;
                }
        }
-       else if (CTX_data_equals(member, "selected_editable_fcurves"))
-       {
+       else if (CTX_data_equals(member, "selected_editable_fcurves")) {
                bAnimContext ac;
 
                if (ANIM_animdata_get_context(C, &ac) && ELEM(ac.spacetype, SPACE_ACTION, SPACE_IPO)) {
index 096bebb..3985122 100644 (file)
@@ -297,7 +297,7 @@ BLI_INLINE uint mcol_colordodge(uint col1, uint col2, int fac)
        cp[0] = (mfac * cp1[0] + temp * fac) / 255;
        temp = (cp2[1] == 255) ? 255 : min_ii((cp1[1] * 225) / (255 - cp2[1]), 255);
        cp[1] = (mfac * cp1[1] + temp * fac) / 255;
-       temp = (cp2[2] == 255) ? 255 : min_ii((cp1[2] * 225 )/ (255 - cp2[2]), 255);
+       temp = (cp2[2] == 255) ? 255 : min_ii((cp1[2] * 225/ (255 - cp2[2]), 255);
        cp[2] = (mfac * cp1[2] + temp * fac) / 255;
        temp = (cp2[3] == 255) ? 255 : min_ii((cp1[3] * 225) / (255 - cp2[3]), 255);
        cp[3] = (mfac * cp1[3] + temp * fac) / 255;
index 487ab32..64eff71 100644 (file)
@@ -4531,29 +4531,28 @@ bool sculpt_stroke_get_location(bContext *C, float out[3], const float mouse[2])
        if (hit == false) {
                const Brush *brush = BKE_paint_brush(BKE_paint_get_active_from_context(C));
                if (ELEM(brush->falloff_shape, PAINT_FALLOFF_SHAPE_TUBE)) {
-               SculptFindNearestToRayData srd = {
-                       .original = original,
-                       .ss = ob->sculpt,
-                       .hit = 0,
-                       .ray_start = ray_start,
-                       .ray_normal = ray_normal,
-                       .depth = FLT_MAX,
-                       .dist_sq_to_ray = FLT_MAX,
-               };
-               BKE_pbvh_find_nearest_to_ray(
-                       ss->pbvh, sculpt_find_nearest_to_ray_cb, &srd,
-                       ray_start, ray_normal, srd.original);
-               if (srd.hit) {
-                       hit = true;
-                       copy_v3_v3(out, ray_normal);
-                       mul_v3_fl(out, srd.depth);
-                       add_v3_v3(out, ray_start);
-               }
+                       SculptFindNearestToRayData srd = {
+                               .original = original,
+                               .ss = ob->sculpt,
+                               .hit = 0,
+                               .ray_start = ray_start,
+                               .ray_normal = ray_normal,
+                               .depth = FLT_MAX,
+                               .dist_sq_to_ray = FLT_MAX,
+                       };
+                       BKE_pbvh_find_nearest_to_ray(
+                               ss->pbvh, sculpt_find_nearest_to_ray_cb, &srd,
+                               ray_start, ray_normal, srd.original);
+                       if (srd.hit) {
+                               hit = true;
+                               copy_v3_v3(out, ray_normal);
+                               mul_v3_fl(out, srd.depth);
+                               add_v3_v3(out, ray_start);
+                       }
                }
        }
 
-       //used in vwpaint
-       if (cache && hit){
+       if (cache && hit) {
                copy_v3_v3(cache->true_location, out);
        }
 
index 48f3dd4..d670af5 100644 (file)
@@ -1994,8 +1994,7 @@ int ED_path_extension_type(const char *path)
        else if (BLI_testextensie(path, ".abc")) {
                return FILE_TYPE_ALEMBIC;
        }
-       else if (BLI_testextensie_array(path, imb_ext_image))
-       {
+       else if (BLI_testextensie_array(path, imb_ext_image)) {
                return FILE_TYPE_IMAGE;
        }
        else if (BLI_testextensie(path, ".ogg")) {
index b30c1d1..02e246d 100644 (file)
@@ -1330,7 +1330,8 @@ static int image_open_exec(bContext *C, wmOperator *op)
                iuser->framenr = 1;
                if (ima->source == IMA_SRC_MOVIE) {
                        iuser->offset = 0;
-               } else {
+               }
+               else {
                        iuser->offset = frame_ofs - 1;
                }
                iuser->fie_ima = 2;
index 9cf0019..a0185b0 100644 (file)
@@ -802,7 +802,7 @@ static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject
                                     "`GL_TYPE` and `typestr` of object with buffer interface do not match. '%s'", pybuffer.format);
                }
                else if (ndimensions != pybuffer.ndim ||
-                       !compare_dimensions(ndimensions, dimensions, pybuffer.shape))
+                        !compare_dimensions(ndimensions, dimensions, pybuffer.shape))
                {
                        PyErr_Format(PyExc_TypeError, "array size does not match");
                }