style cleanup

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 5cff61f42390c403d9897dfece9940d37d221d01..fbb1ad10f56e9d3783d01a406d61b7b878b1fd63 100644 (file)
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4253,7 +4253,7 @@ static int ui_numedit_but_HISTOGRAM(uiBut *but, uiHandleButtonData *data, int mx
 
        if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
                /* resize histogram widget itself */
 
        if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
                /* resize histogram widget itself */

-               hist->height = (BLI_rctf_size_y(&but->rect) + (data->dragstarty - my))/UI_DPI_FAC;
+               hist->height = (BLI_rctf_size_y(&but->rect) + (data->dragstarty - my)) / UI_DPI_FAC;

        }
        else {
                /* scale histogram values (dy / 10 for better control) */
        }
        else {
                /* scale histogram values (dy / 10 for better control) */


@@ -4337,7 +4337,7 @@ static int ui_numedit_but_WAVEFORM(uiBut *but, uiHandleButtonData *data, int mx,
 
        if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
                /* resize waveform widget itself */
 
        if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
                /* resize waveform widget itself */

-               scopes->wavefrm_height = (BLI_rctf_size_y(&but->rect) + (data->dragstarty - my))/UI_DPI_FAC;
+               scopes->wavefrm_height = (BLI_rctf_size_y(&but->rect) + (data->dragstarty - my)) / UI_DPI_FAC;

        }
        else {
                /* scale waveform values */
        }
        else {
                /* scale waveform values */


@@ -4419,7 +4419,7 @@ static int ui_numedit_but_VECTORSCOPE(uiBut *but, uiHandleButtonData *data, int
 
        if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
                /* resize vectorscope widget itself */
 
        if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
                /* resize vectorscope widget itself */

-               scopes->vecscope_height = (BLI_rctf_size_y(&but->rect) + (data->dragstarty - my))/UI_DPI_FAC;
+               scopes->vecscope_height = (BLI_rctf_size_y(&but->rect) + (data->dragstarty - my)) / UI_DPI_FAC;

        }
 
        data->draglastx = mx;
        }
 
        data->draglastx = mx;


@@ -4622,7 +4622,7 @@ static int ui_numedit_but_TRACKPREVIEW(bContext *C, uiBut *but, uiHandleButtonDa
 
        if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
                /* resize preview widget itself */
 
        if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
                /* resize preview widget itself */

-               scopes->track_preview_height = (BLI_rctf_size_y(&but->rect) + (data->dragstarty - my))/UI_DPI_FAC;
+               scopes->track_preview_height = (BLI_rctf_size_y(&but->rect) + (data->dragstarty - my)) / UI_DPI_FAC;

        }
        else {
                if (!scopes->track_locked) {
        }
        else {
                if (!scopes->track_locked) {

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 8a01cf351bf3b472a3a1bcda2fc747c29c44705d..1b7cd4a6d2065c36d4928732df6165202eb58e2c 100644 (file)
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1967,11 +1967,11 @@ void ED_region_visible_rect(ARegion *ar, rcti *rect)
                        if (BLI_rcti_isect(rect, &arn->winrct, NULL)) {
                                
                                /* overlap left, also check 1 pixel offset (2 regions on one side) */
                        if (BLI_rcti_isect(rect, &arn->winrct, NULL)) {
                                
                                /* overlap left, also check 1 pixel offset (2 regions on one side) */

-                               if ( ABS(rect->xmin - arn->winrct.xmin) < 2)
+                               if (ABS(rect->xmin - arn->winrct.xmin) < 2)

                                        rect->xmin = arn->winrct.xmax;
 
                                /* overlap right */
                                        rect->xmin = arn->winrct.xmax;
 
                                /* overlap right */

-                               if ( ABS(rect->xmax - arn->winrct.xmax) < 2)
+                               if (ABS(rect->xmax - arn->winrct.xmax) < 2)

                                        rect->xmax = arn->winrct.xmin;
                        }
                }
                                        rect->xmax = arn->winrct.xmin;
                        }
                }

diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c
index b2d31ececa5f88556dfb45c4531c4928c3204d80..9409ce42d3a40b2cd36998172a3e8b8be2ae0bc8 100644 (file)
--- a/source/blender/editors/space_clip/clip_buttons.c
+++ b/source/blender/editors/space_clip/clip_buttons.c
@@ -407,7 +407,7 @@ void uiTemplateMarker(uiLayout *layout, PointerRNA *ptr, const char *propname, P
                if (track->flag & TRACK_LOCKED) {
                        uiLayoutSetActive(layout, FALSE);
                        block = uiLayoutAbsoluteBlock(layout);
                if (track->flag & TRACK_LOCKED) {
                        uiLayoutSetActive(layout, FALSE);
                        block = uiLayoutAbsoluteBlock(layout);

-                       uiDefBut(block, LABEL, 0, IFACE_("Track is locked"), 0, 0, UI_UNIT_X*15.0f, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
+                       uiDefBut(block, LABEL, 0, IFACE_("Track is locked"), 0, 0, UI_UNIT_X * 15.0f, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");

 
                        return;
                }
 
                        return;
                }

diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index 3d04b8ee18479ca48b7b6468eb9ca8c80e838158..f4ac4322747718880cf9dc55b2ff26ead7cd66d2 100644 (file)
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -803,7 +803,7 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters)
 
                        case 16:
                                if (numcomps == 4) {
 
                        case 16:
                                if (numcomps == 4) {

-                                       if (channels_in_float == 4){
+                                       if (channels_in_float == 4) {

                                                PIXEL_LOOPER_BEGIN(rect_float)
                                                {
                                                        premul_to_straight_v4_v4(from_straight, rect_float);
                                                PIXEL_LOOPER_BEGIN(rect_float)
                                                {
                                                        premul_to_straight_v4_v4(from_straight, rect_float);