[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54823] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Feb 24 21:33:22 CET 2013
Revision: 54823
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54823
Author: campbellbarton
Date: 2013-02-24 20:33:21 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/space_clip/clip_buttons.c
trunk/blender/source/blender/imbuf/intern/jp2.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-02-24 19:33:10 UTC (rev 54822)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-02-24 20:33:21 UTC (rev 54823)
@@ -4253,7 +4253,7 @@
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) */
@@ -4337,7 +4337,7 @@
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 */
@@ -4419,7 +4419,7 @@
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;
@@ -4622,7 +4622,7 @@
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) {
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c 2013-02-24 19:33:10 UTC (rev 54822)
+++ trunk/blender/source/blender/editors/screen/area.c 2013-02-24 20:33:21 UTC (rev 54823)
@@ -1967,11 +1967,11 @@
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 */
- if ( ABS(rect->xmax - arn->winrct.xmax) < 2)
+ if (ABS(rect->xmax - arn->winrct.xmax) < 2)
rect->xmax = arn->winrct.xmin;
}
}
Modified: trunk/blender/source/blender/editors/space_clip/clip_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_buttons.c 2013-02-24 19:33:10 UTC (rev 54822)
+++ trunk/blender/source/blender/editors/space_clip/clip_buttons.c 2013-02-24 20:33:21 UTC (rev 54823)
@@ -407,7 +407,7 @@
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;
}
Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c 2013-02-24 19:33:10 UTC (rev 54822)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c 2013-02-24 20:33:21 UTC (rev 54823)
@@ -803,7 +803,7 @@
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);
More information about the Bf-blender-cvs
mailing list