diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-12-20 16:10:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-20 16:14:41 +0300 |
commit | fdcec62dada7042e9c720086744ac32abf957569 (patch) | |
tree | ea645318bdb3d75c7d069276e3522ed2f85024e6 /source | |
parent | 008e7701c5f0625f88b6cbc290b15fc2c9dfadbf (diff) |
Cleanup: invalid comment & style
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/operators/bmo_primitive.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/filter.c | 8 |
3 files changed, 7 insertions, 11 deletions
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index 33681c992a0..0935e0acb45 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -78,10 +78,6 @@ static const short icoface[20][3] = { {10, 9, 11} }; -/* HACK: these can also be found in cmoview.tga.c, but are here so that they can be found by linker - * this hack is only used so that scons & mingw + split-sources hack works - * ------------------------------- start copied code */ -/* these are not the monkeys you are looking for */ static const int monkeyo = 4; static const int monkeynv = 271; static const int monkeynf = 250; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index b3224ddaf3d..47dccd072c2 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -9532,7 +9532,7 @@ static int ui_pie_handler(bContext *C, const wmEvent *event, uiPopupBlockHandle but = ui_but_find_active_in_region(menu->region); if (but && (U.pie_menu_confirm > 0) && - (dist >= U.pie_menu_threshold + U.pie_menu_confirm)) + (dist >= U.pie_menu_threshold + U.pie_menu_confirm)) { if (but) return ui_but_pie_menu_apply(C, menu, but, true); @@ -9559,7 +9559,7 @@ static int ui_pie_handler(bContext *C, const wmEvent *event, uiPopupBlockHandle /* here instead, we use the offset location to account for the initial direction timeout */ if ((U.pie_menu_confirm > 0) && - (dist >= U.pie_menu_threshold + U.pie_menu_confirm)) + (dist >= U.pie_menu_threshold + U.pie_menu_confirm)) { block->pie_data.flags |= UI_PIE_GESTURE_END_WAIT; copy_v2_v2(block->pie_data.last_pos, event_xy); @@ -9617,7 +9617,7 @@ static int ui_pie_handler(bContext *C, const wmEvent *event, uiPopupBlockHandle case ZKEY: { if ((event->val == KM_PRESS || event->val == KM_DBL_CLICK) && - !IS_EVENT_MOD(event, shift, ctrl, oskey)) + !IS_EVENT_MOD(event, shift, ctrl, oskey)) { for (but = block->buttons.first; but; but = but->next) { if (but->menu_key == event->type) { diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c index 90b3fe092a8..26ced49a333 100644 --- a/source/blender/imbuf/intern/filter.c +++ b/source/blender/imbuf/intern/filter.c @@ -288,10 +288,10 @@ static void imb_filterN(ImBuf *out, ImBuf *in) r33 = row3 + channels; } - cp[0] = (r11[0] + 2 * row1[0] + r13[0] + 2 * r21[0] + 4 * row2[0] + 2 * r23[0] + r31[0] + 2 * row3[0] + r33[0]) * (1.0f/16.0f); - cp[1] = (r11[1] + 2 * row1[1] + r13[1] + 2 * r21[1] + 4 * row2[1] + 2 * r23[1] + r31[1] + 2 * row3[1] + r33[1]) * (1.0f/16.0f); - cp[2] = (r11[2] + 2 * row1[2] + r13[2] + 2 * r21[2] + 4 * row2[2] + 2 * r23[2] + r31[2] + 2 * row3[2] + r33[2]) * (1.0f/16.0f); - cp[3] = (r11[3] + 2 * row1[3] + r13[3] + 2 * r21[3] + 4 * row2[3] + 2 * r23[3] + r31[3] + 2 * row3[3] + r33[3]) * (1.0f/16.0f); + cp[0] = (r11[0] + 2 * row1[0] + r13[0] + 2 * r21[0] + 4 * row2[0] + 2 * r23[0] + r31[0] + 2 * row3[0] + r33[0]) * (1.0f / 16.0f); + cp[1] = (r11[1] + 2 * row1[1] + r13[1] + 2 * r21[1] + 4 * row2[1] + 2 * r23[1] + r31[1] + 2 * row3[1] + r33[1]) * (1.0f / 16.0f); + cp[2] = (r11[2] + 2 * row1[2] + r13[2] + 2 * r21[2] + 4 * row2[2] + 2 * r23[2] + r31[2] + 2 * row3[2] + r33[2]) * (1.0f / 16.0f); + cp[3] = (r11[3] + 2 * row1[3] + r13[3] + 2 * r21[3] + 4 * row2[3] + 2 * r23[3] + r31[3] + 2 * row3[3] + r33[3]) * (1.0f / 16.0f); cp += channels; row1 += channels; row2 += channels; row3 += channels; } } |