diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 09:50:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 09:52:59 +0300 |
commit | a54bdd76cb34005d07a65c2c3a8198b7b8e8c95a (patch) | |
tree | c30e2477cc3c12b1dd046f4fd12c728114c94563 /source/blender/editors | |
parent | 223f9310955f6b0d6f1089c16802a57e20fcadb3 (diff) |
ClangFormat: format '#if 0' code
Previous cleanups didn't account for space after '#'.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 8 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_ops.c | 6 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_ops.c | 7 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
5 files changed, 19 insertions, 16 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 3ab6f9aa5e9..4b66461e186 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -731,9 +731,11 @@ static void init_internal_icons(void) bbuf = IMB_loadiffname(iconfilestr, IB_rect, NULL); if (bbuf && (bbuf->x < ICON_IMAGE_W || bbuf->y < ICON_IMAGE_H)) { - printf("\n***WARNING***\n" - "Icons file '%s' too small.\n" - "Using built-in Icons instead\n", iconfilestr); + printf( + "\n***WARNING***\n" + "Icons file '%s' too small.\n" + "Using built-in Icons instead\n", + iconfilestr); IMB_freeImBuf(bbuf); bbuf = NULL; } diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 537a1d4c851..768cc32aeb5 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1125,8 +1125,7 @@ static void ui_editsource_active_but_clear(void) static bool ui_editsource_uibut_match(uiBut *but_a, uiBut *but_b) { # if 0 - printf("matching buttons: '%s' == '%s'\n", - but_a->drawstr, but_b->drawstr); + printf("matching buttons: '%s' == '%s'\n", but_a->drawstr, but_b->drawstr); # endif /* this just needs to be a 'good-enough' comparison so we can know beyond @@ -1153,8 +1152,7 @@ void UI_editsource_active_but_test(uiBut *but) int lineno = -1; # if 0 - printf("comparing buttons: '%s' == '%s'\n", - but->drawstr, ui_editsource_info->but_orig.drawstr); + printf("comparing buttons: '%s' == '%s'\n", but->drawstr, ui_editsource_info->but_orig.drawstr); # endif PyC_FileAndNum_Safe(&fn, &lineno); diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 2769d1a9dc3..65fb58efe6d 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -185,16 +185,18 @@ static void fluidsimPrintChannel(FILE *file, float *channel, int paramsize, char } fprintf(file, " CHANNEL %s =\n", str); - for (i=0; i < channelSize; i++) { + for (i = 0; i < channelSize; i++) { fprintf(file, " "); - for (j=0;j <= entries;j++) { // also print time value - fprintf(file, " %f ", channel[i*(entries + 1) + j]); - if (j == entries-1) { fprintf(file, " "); } + for (j = 0; j <= entries; j++) { // also print time value + fprintf(file, " %f ", channel[i * (entries + 1) + j]); + if (j == entries - 1) { + fprintf(file, " "); + } } fprintf(file, "\n"); } - fprintf(file, " ;\n"); + fprintf(file, " ;\n"); } # endif diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index c069fc600e8..f2fdffb15c8 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -689,9 +689,9 @@ static int text_refresh_pyconstraints_exec(bContext *UNUSED(C), wmOperator *UNUS for (con = pchan->constraints.first; con; con = con->next) { if (con->type == CONSTRAINT_TYPE_PYTHON) { bPythonConstraint *data = con->data; - if (data->text == text) BPY_pyconstraint_update(ob, con); + if (data->text == text) + BPY_pyconstraint_update(ob, con); update = 1; - } } } @@ -699,7 +699,8 @@ static int text_refresh_pyconstraints_exec(bContext *UNUSED(C), wmOperator *UNUS for (con = ob->constraints.first; con; con = con->next) { if (con->type == CONSTRAINT_TYPE_PYTHON) { bPythonConstraint *data = con->data; - if (data->text == text) BPY_pyconstraint_update(ob, con); + if (data->text == text) + BPY_pyconstraint_update(ob, con); update = 1; } } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 4610111aafa..2c831c0877c 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -967,7 +967,7 @@ static void draw_rotation_guide(const RegionView3D *rv3d) immVertex3fv(pos, end); # if 0 - color[3] = 0.2f + fabsf(rv3d->rot_angle); /* modulate opacity with angle */ + color[3] = 0.2f + fabsf(rv3d->rot_angle); /* modulate opacity with angle */ /* ^^ neat idea, but angle is frame-rate dependent, so it's usually close to 0.2 */ # endif |