[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60901] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Oct 23 04:52:28 CEST 2013
Revision: 60901
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60901
Author: campbellbarton
Date: 2013-10-23 02:52:27 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
trunk/blender/source/blender/editors/space_file/fsmenu.c
trunk/blender/source/blender/editors/space_text/space_text.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/imbuf/intern/oiio/openimageio_api.cpp
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp 2013-10-23 02:52:27 UTC (rev 60901)
@@ -47,8 +47,8 @@
const bNodeTree *basetree = system.getContext().getbNodeTree();
/* update viewers in the active edittree as well the base tree (for backdrop) */
- bool is_active_group = (parent_key.value == basetree->active_viewer_key.value
- || tree == basetree);
+ bool is_active_group = ((parent_key.value == basetree->active_viewer_key.value) ||
+ (tree == basetree));
/* add all nodes of the tree to the node list */
bNode *node = (bNode *)tree->nodes.first;
Modified: trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp 2013-10-23 02:52:27 UTC (rev 60901)
@@ -290,41 +290,41 @@
X = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss X buf");
Y = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss Y buf");
W = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss W buf");
- if (xy & 1) { // H
- int offset;
+ if (xy & 1) { // H
+ int offset;
for (y = 0; y < src_height; ++y) {
- const int yx = y * src_width;
- offset = yx*COM_NUMBER_OF_CHANNELS + chan;
- for (x = 0; x < src_width; ++x) {
- X[x] = buffer[offset];
- offset += COM_NUMBER_OF_CHANNELS;
- }
+ const int yx = y * src_width;
+ offset = yx*COM_NUMBER_OF_CHANNELS + chan;
+ for (x = 0; x < src_width; ++x) {
+ X[x] = buffer[offset];
+ offset += COM_NUMBER_OF_CHANNELS;
+ }
YVV(src_width);
- offset = yx*COM_NUMBER_OF_CHANNELS + chan;
- for (x = 0; x < src_width; ++x) {
- buffer[offset] = Y[x];
- offset += COM_NUMBER_OF_CHANNELS;
- }
- }
+ offset = yx*COM_NUMBER_OF_CHANNELS + chan;
+ for (x = 0; x < src_width; ++x) {
+ buffer[offset] = Y[x];
+ offset += COM_NUMBER_OF_CHANNELS;
+ }
+ }
}
- if (xy & 2) { // V
- int offset;
- const int add = src_width * COM_NUMBER_OF_CHANNELS;
+ if (xy & 2) { // V
+ int offset;
+ const int add = src_width * COM_NUMBER_OF_CHANNELS;
- for (x = 0; x < src_width; ++x) {
- offset = x * COM_NUMBER_OF_CHANNELS + chan;
- for (y = 0; y < src_height; ++y) {
- X[y] = buffer[offset];
- offset += add;
- }
+ for (x = 0; x < src_width; ++x) {
+ offset = x * COM_NUMBER_OF_CHANNELS + chan;
+ for (y = 0; y < src_height; ++y) {
+ X[y] = buffer[offset];
+ offset += add;
+ }
YVV(src_height);
- offset = x * COM_NUMBER_OF_CHANNELS + chan;
- for (y = 0; y < src_height; ++y) {
- buffer[offset] = Y[y];
- offset += add;
- }
- }
- }
+ offset = x * COM_NUMBER_OF_CHANNELS + chan;
+ for (y = 0; y < src_height; ++y) {
+ buffer[offset] = Y[y];
+ offset += add;
+ }
+ }
+ }
MEM_freeN(X);
MEM_freeN(W);
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2013-10-23 02:52:27 UTC (rev 60901)
@@ -1107,7 +1107,6 @@
break;
case ANIMCONT_SHAPEKEY: // DOUBLE CHECK ME...
-
default: /* some collection of actions */
if (adt->action)
rearrange_action_channels(&ac, adt->action, mode);
@@ -2455,7 +2454,7 @@
* Only do this if "Only Selected" dopesheet filter is not active, or else it
* becomes too unpredictable/tricky to manage
*/
- if ((ac->ads->filterflag & ADS_FILTER_ONLYSEL)==0) {
+ if ((ac->ads->filterflag & ADS_FILTER_ONLYSEL) == 0) {
if ((ale->id) && (GS(ale->id->name) == ID_OB)) {
ob = (Object *)ale->id;
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2013-10-23 02:52:27 UTC (rev 60901)
@@ -2032,7 +2032,8 @@
MEM_freeN(usel);
if ((newu == 0 || newv == 0) ||
- (split && !isNurbselU(nu, &newv, SELECT) && !isNurbselV(nu, &newu, SELECT))) {
+ (split && !isNurbselU(nu, &newv, SELECT) && !isNurbselV(nu, &newu, SELECT)))
+ {
if (G.debug & G_DEBUG)
printf("Can't duplicate Nurb\n");
}
@@ -6076,7 +6077,8 @@
bezt2 = &nu->bezt[1];
if (BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
- BEZSELECTED_HIDDENHANDLES(cu, bezt2)) {
+ BEZSELECTED_HIDDENHANDLES(cu, bezt2))
+ {
nu1 = BKE_nurb_copy(nu, 1, 1);
ED_curve_beztcpy(editnurb, nu1->bezt, bezt1, 1);
BLI_addtail(&newnurb, nu1);
@@ -6086,7 +6088,8 @@
bezt2 = &nu->bezt[nu->pntsu - 2];
if (BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
- BEZSELECTED_HIDDENHANDLES(cu, bezt2)) {
+ BEZSELECTED_HIDDENHANDLES(cu, bezt2))
+ {
nu1 = BKE_nurb_copy(nu, 1, 1);
ED_curve_beztcpy(editnurb, nu1->bezt, bezt1, 1);
BLI_addtail(&newnurb, nu1);
Modified: trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c 2013-10-23 02:52:27 UTC (rev 60901)
@@ -186,7 +186,7 @@
/* selected knot handles on top of curves */
userdata.sel = TRUE;
clip_graph_tracking_values_iterate(sc,
- (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) !=0,
+ (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
(sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
&userdata, tracking_segment_knot_cb, NULL, NULL);
}
Modified: trunk/blender/source/blender/editors/space_file/fsmenu.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/fsmenu.c 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/editors/space_file/fsmenu.c 2013-10-23 02:52:27 UTC (rev 60901)
@@ -415,9 +415,9 @@
if (result != kCFURLEnumeratorSuccess)
continue;
- CFURLGetFileSystemRepresentation(cfURL, false, (UInt8*)defPath, FILE_MAX);
+ CFURLGetFileSystemRepresentation(cfURL, false, (UInt8 *)defPath, FILE_MAX);
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, (char *)defPath, FS_INSERT_SORTED);
- }
+ }
CFRelease(volEnum);
Modified: trunk/blender/source/blender/editors/space_text/space_text.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/space_text.c 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/editors/space_text/space_text.c 2013-10-23 02:52:27 UTC (rev 60901)
@@ -475,14 +475,14 @@
static int text_drop_paste_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event))
{
if (drag->type == WM_DRAG_ID)
- return TRUE;
+ return true;
- return FALSE;
+ return false;
}
static void text_drop_paste(wmDrag *drag, wmDropBox *drop)
{
- RNA_string_set(drop->ptr, "text", ((ID*)drag->poin)->name + 2);
+ RNA_string_set(drop->ptr, "text", ((ID *)drag->poin)->name + 2);
}
/* this region dropbox definition */
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2013-10-23 02:52:27 UTC (rev 60901)
@@ -6591,8 +6591,7 @@
if (ob->restrictflag & OB_RESTRICT_VIEW) {
return;
}
- else if ((ob->restrictflag & OB_RESTRICT_RENDER) && render_override)
- {
+ else if ((ob->restrictflag & OB_RESTRICT_RENDER) && render_override) {
return;
}
}
Modified: trunk/blender/source/blender/imbuf/intern/oiio/openimageio_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/oiio/openimageio_api.cpp 2013-10-22 23:32:41 UTC (rev 60900)
+++ trunk/blender/source/blender/imbuf/intern/oiio/openimageio_api.cpp 2013-10-23 02:52:27 UTC (rev 60901)
@@ -99,14 +99,17 @@
try
{
if (!in->read_image(TypeDesc::UINT8,
- (uchar *)ibuf->rect + (height - 1) * scanlinesize,
- AutoStride,
- -scanlinesize,
- AutoStride)) {
+ (uchar *)ibuf->rect + (height - 1) * scanlinesize,
+ AutoStride,
+ -scanlinesize,
+ AutoStride))
+ {
std::cerr << __func__ << ": ImageInput::read_image() failed:" << std::endl
- << in->geterror() << std::endl;
- if (ibuf) IMB_freeImBuf(ibuf);
+ << in->geterror() << std::endl;
+ if (ibuf)
+ IMB_freeImBuf(ibuf);
+
return NULL;
}
}
@@ -135,14 +138,17 @@
try
{
if (!in->read_image(TypeDesc::FLOAT,
- (uchar *)ibuf->rect_float + (height - 1) * scanlinesize,
- AutoStride,
- -scanlinesize,
- AutoStride)) {
+ (uchar *)ibuf->rect_float + (height - 1) * scanlinesize,
+ AutoStride,
+ -scanlinesize,
+ AutoStride))
+ {
std::cerr << __func__ << ": ImageInput::read_image() failed:" << std::endl
- << in->geterror() << std::endl;
- if (ibuf) IMB_freeImBuf(ibuf);
+ << in->geterror() << std::endl;
+ if (ibuf)
+ IMB_freeImBuf(ibuf);
+
return NULL;
}
}
@@ -205,7 +211,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list