[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58413] trunk/blender/source: style cleanup: braces/indentation
Campbell Barton
ideasman42 at gmail.com
Fri Jul 19 18:44:17 CEST 2013
Revision: 58413
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58413
Author: campbellbarton
Date: 2013-07-19 16:44:17 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
style cleanup: braces/indentation
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/nodes/shader/nodes/node_shader_particle_info.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c
trunk/blender/source/blender/windowmanager/wm_event_types.h
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_rotation.c 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/blenlib/intern/math_rotation.c 2013-07-19 16:44:17 UTC (rev 58413)
@@ -1816,7 +1816,7 @@
{0x408, 0x810, 0xA20, 0x228, 0x081, 0x891, 0x699, 0x2A9, 0x102, 0x50A,
0x71A, 0xB22, 0x4CB, 0x8D3, 0xAE3, 0x2EB, 0x144, 0x954, 0x75C, 0x36C,
0x045, 0x44D, 0x65D, 0xA65},
- };
+};
// _axis_convert_num = {'X': 0, 'Y': 1, 'Z': 2, '-X': 3, '-Y': 4, '-Z': 5}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c 2013-07-19 16:44:17 UTC (rev 58413)
@@ -217,7 +217,7 @@
/* Continue with ad-hoc fill methods since operators fail,
* edge, vcloud... may add more */
- if (0) { /* nice feature but perhaps it should be a different tool? */
+ if (0) { /* nice feature but perhaps it should be a different tool? */
/* tricky feature for making a line/edge from selection history...
*
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c 2013-07-19 16:44:17 UTC (rev 58413)
@@ -261,11 +261,14 @@
eed_last = eed;
}
+ if ((eed_last != eed_start) &&
#ifdef BMW_EDGERING_NGON
- if (lasteed != startedge && BM_edge_share_face_check(lasteed, startedge)) {
+ BM_edge_share_face_check(eed_last, eed_start)
#else
- if (eed_last != eed_start && BM_edge_share_quad_check(eed_last, eed_start)) {
+ BM_edge_share_quad_check(eed_last, eed_start)
#endif
+ )
+ {
v[1][0] = v[0][0];
v[1][1] = v[0][1];
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-07-19 16:44:17 UTC (rev 58413)
@@ -927,10 +927,11 @@
}
else if (em->selectmode & SCE_SELECT_FACE) {
#ifdef WITH_FREESTYLE
- for (a = SIMFACE_MATERIAL; a <= SIMFACE_FREESTYLE; a++) {
+ const int a_end = SIMFACE_FREESTYLE;
#else
- for (a = SIMFACE_MATERIAL; a <= SIMFACE_COPLANAR; a++) {
+ const int a_end = SIMFACE_COPLANAR;
#endif
+ for (a = SIMFACE_MATERIAL; a <= a_end; a++) {
RNA_enum_items_add_value(&item, &totitem, prop_similar_types, a);
}
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2013-07-19 16:44:17 UTC (rev 58413)
@@ -576,8 +576,8 @@
if (sculpt_is_grab_tool(br))
return false;
default:
- ;
- }
+ break;
+ }
return true;
}
Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c 2013-07-19 16:44:17 UTC (rev 58413)
@@ -429,10 +429,9 @@
}
}
}
- else {
-#else
- if (1) {
+ else
#endif
+ {
ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect);
tmp = AVI_read_frame(anim->avi, AVI_FORMAT_RGB32, position,
Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2013-07-19 16:44:17 UTC (rev 58413)
@@ -97,7 +97,8 @@
public:
Mem_IStream (unsigned char *exrbuf, size_t exrsize) :
- IStream("dummy"), _exrpos(0), _exrsize(exrsize) {
+ IStream("dummy"), _exrpos(0), _exrsize(exrsize)
+ {
_exrbuf = exrbuf;
}
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_particle_info.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_particle_info.c 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_particle_info.c 2013-07-19 16:44:17 UTC (rev 58413)
@@ -39,7 +39,7 @@
{ SOCK_VECTOR, 0, "Velocity" },
{ SOCK_VECTOR, 0, "Angular Velocity" },
{ -1, 0, "" }
- };
+};
/* node type definition */
void register_node_type_sh_particle_info(void)
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c 2013-07-19 16:44:17 UTC (rev 58413)
@@ -499,7 +499,7 @@
(objobjproc)bpy_bmdeformvert_contains, /* sq_contains */
(binaryfunc) NULL, /* sq_inplace_concat */
(ssizeargfunc) NULL, /* sq_inplace_repeat */
- };
+};
static PyMappingMethods bpy_bmdeformvert_as_mapping = {
(lenfunc)bpy_bmdeformvert_len,
Modified: trunk/blender/source/blender/windowmanager/wm_event_types.h
===================================================================
--- trunk/blender/source/blender/windowmanager/wm_event_types.h 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/blender/windowmanager/wm_event_types.h 2013-07-19 16:44:17 UTC (rev 58413)
@@ -135,7 +135,7 @@
NDOF_BUTTON_C,
// the end
NDOF_LAST
- };
+};
/* SYSTEM : 0x01xx */
Modified: trunk/blender/source/tools/check_style_c.py
===================================================================
--- trunk/blender/source/tools/check_style_c.py 2013-07-19 16:30:08 UTC (rev 58412)
+++ trunk/blender/source/tools/check_style_c.py 2013-07-19 16:44:17 UTC (rev 58413)
@@ -647,7 +647,7 @@
# Warning, this is a fairly slow check and guesses
# based on some fuzzy rules
- # assert(tokens[index] == "{")
+ # assert(tokens[index].text == "{")
# check function declaration is not:
# 'void myfunc() {'
@@ -711,6 +711,28 @@
warning("function's '{' must be on a newline", i_begin, i)
+def blender_check_brace_indent(i):
+ # assert(tokens[index].text == "{")
+
+ i_match = tk_match_backet(i)
+
+ if tokens[i].line != tokens[i_match].line:
+ ws_i_match = extract_to_linestart(i_match)
+
+ # allow for...
+ # a[] = {1, 2,
+ # 3, 4}
+ # ... so only check braces which are the first text
+ if ws_i_match.isspace():
+ ws_i = extract_to_linestart(i)
+ ws_i_match_lstrip = ws_i_match.lstrip()
+
+ ws_i = ws_i[:len(ws_i) - len(ws_i.lstrip())]
+ ws_i_match = ws_i_match[:len(ws_i_match) - len(ws_i_match_lstrip)]
+ if ws_i != ws_i_match:
+ warning("indentation '{' does not match brace", i, i_match)
+
+
def quick_check_indentation(code):
"""
Quick check for multiple tab indents.
@@ -828,6 +850,9 @@
if item_range is not None:
blender_check_cast(item_range[0], item_range[1])
elif tok.text == "{":
+ # check matching brace is indented correctly (slow!)
+ blender_check_brace_indent(i)
+
# check previous character is either a '{' or whitespace.
if (tokens[i - 1].line == tok.line) and not (tokens[i - 1].text.isspace() or tokens[i - 1].text == "{"):
warning("no space before '{'", i, i)
More information about the Bf-blender-cvs
mailing list