Revision: 53909
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53909
Author: campbellbarton
Date: 2013-01-19 06:12:25 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_particle.h
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/imbuf/intern/dds/Stream.cpp
trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_particle.h 2013-01-19
04:20:53 UTC (rev 53908)
+++ trunk/blender/source/blender/blenkernel/BKE_particle.h 2013-01-19
06:12:25 UTC (rev 53909)
@@ -306,7 +306,7 @@
void psys_sph_init(struct ParticleSimulationData *sim, struct SPHData
*sphdata);
void psys_sph_finalise(struct SPHData *sphdata);
-void psys_sph_density(struct BVHTree *tree, struct SPHData* data, float co[3],
float vars[2]);
+void psys_sph_density(struct BVHTree *tree, struct SPHData *data, float co[3],
float vars[2]);
/* for anim.c */
void psys_get_dupli_texture(struct ParticleSystem *psys, struct
ParticleSettings *part,
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2013-01-19
04:20:53 UTC (rev 53908)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2013-01-19
06:12:25 UTC (rev 53909)
@@ -1559,7 +1559,7 @@
if (S == 1) { (*out)[1] = -(*out)[1]; }
else if (S == 2) { SWAP(float, (*out)[0],
(*out)[1]); }
else if (S == 3) { (*out)[0] = -(*out)[0]; }
- else if (S == 0) { SWAP(float, (*out)[0],
(*out)[1]); (*out)[0] = -(*out)[0]; (*out)[1] = -(*out)[1]; };
+ else if (S == 0) { SWAP(float, (*out)[0],
(*out)[1]); (*out)[0] = -(*out)[0]; (*out)[1] = -(*out)[1]; }
}
}
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2013-01-19
04:20:53 UTC (rev 53908)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2013-01-19
06:12:25 UTC (rev 53909)
@@ -387,7 +387,7 @@
if (ele->head.htype == BM_FACE) {
f = (BMFace *)ele;
add_normal_aligned(nor, f->no);
- };
+ }
}
normalize_v3(nor);
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2013-01-19
04:20:53 UTC (rev 53908)
+++ trunk/blender/source/blender/editors/transform/transform.c 2013-01-19
06:12:25 UTC (rev 53909)
@@ -6284,7 +6284,7 @@
snapGrid(t, &final);
/* only do this so out of range values are not displayed */
- if(is_constrained) {
+ if (is_constrained) {
CLAMP(final, 0.0f, 1.0f);
}
@@ -6303,7 +6303,7 @@
final, !is_proportional ? "ON" : "OFF", flipped ?
"ON" : "OFF", (t->flag & T_ALT_TRANSFORM) ? "ON" : "OFF");
}
- if(is_constrained) {
+ if (is_constrained) {
CLAMP(final, 0.0f, 1.0f);
}
Modified: trunk/blender/source/blender/imbuf/intern/dds/Stream.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/Stream.cpp 2013-01-19
04:20:53 UTC (rev 53908)
+++ trunk/blender/source/blender/imbuf/intern/dds/Stream.cpp 2013-01-19
06:12:25 UTC (rev 53909)
@@ -47,7 +47,7 @@
if (mem.pos + 8 > mem.size) {
printf("DDS: trying to read beyond end of stream (corrupt
file?)");
return(0);
- };
+ }
memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian
mem.pos += 8;
return(8);
@@ -58,7 +58,7 @@
if (mem.pos + 4 > mem.size) {
printf("DDS: trying to read beyond end of stream (corrupt
file?)");
return(0);
- };
+ }
memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian
mem.pos += 4;
return(4);
@@ -69,7 +69,7 @@
if (mem.pos + 2 > mem.size) {
printf("DDS: trying to read beyond end of stream (corrupt
file?)");
return(0);
- };
+ }
memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian
mem.pos += 2;
return(2);
@@ -80,7 +80,7 @@
if (mem.pos + 1 > mem.size) {
printf("DDS: trying to read beyond end of stream (corrupt
file?)");
return(0);
- };
+ }
i = (mem.mem + mem.pos)[0];
mem.pos += 1;
return(1);
@@ -91,7 +91,7 @@
if (mem.pos + cnt > mem.size) {
printf("DDS: trying to read beyond end of stream (corrupt
file?)");
return(0);
- };
+ }
memcpy(i, mem.mem + mem.pos, cnt);
mem.pos += cnt;
return(cnt);
Modified: trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp 2013-01-19
04:20:53 UTC (rev 53908)
+++ trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp 2013-01-19
06:12:25 UTC (rev 53909)
@@ -136,9 +136,9 @@
if (pixel.a != 255) {
bits_per_pixel = 32;
break;
- };
- };
- };
+ }
+ }
+ }
ibuf = IMB_allocImBuf(dds.width(), dds.height(), bits_per_pixel, 0);
if (ibuf == 0) return(0); /* memory allocation failed */
Modified: trunk/blender/source/blender/imbuf/intern/indexer.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/indexer.c 2013-01-19 04:20:53 UTC
(rev 53908)
+++ trunk/blender/source/blender/imbuf/intern/indexer.c 2013-01-19 06:12:25 UTC
(rev 53909)
@@ -332,7 +332,7 @@
return 3;
default:
return 0;
- };
+ }
return 0;
}
@@ -352,7 +352,7 @@
return 3;
default:
return 0;
- };
+ }
return 0;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
2013-01-19 04:20:53 UTC (rev 53908)
+++ trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
2013-01-19 06:12:25 UTC (rev 53909)
@@ -385,7 +385,8 @@
sys->ring_areas[idv2] += average_area_quad_v3(v2, v3,
v4, v1);
sys->ring_areas[idv3] += average_area_quad_v3(v3, v4,
v1, v2);
sys->ring_areas[idv4] += average_area_quad_v3(v4, v1,
v2, v3);
- } else {
+ }
+ else {
sys->ring_areas[idv1] += areaf;
sys->ring_areas[idv2] += areaf;
sys->ring_areas[idv3] += areaf;
Modified: trunk/blender/source/tools/check_style_c.py
===================================================================
--- trunk/blender/source/tools/check_style_c.py 2013-01-19 04:20:53 UTC (rev
53908)
+++ trunk/blender/source/tools/check_style_c.py 2013-01-19 06:12:25 UTC (rev
53909)
@@ -313,6 +313,14 @@
if tokens[index_kw].line != tokens[index_kw_end].line:
warning("multi-line if should use a brace '%s (\\n\\n)
statement;'" % tokens[index_kw].text, index_kw, index_kw_end)
+ # check for: if () { ... };
+ #
+ # no need to have semicolon after brace.
+ if tokens[index_next].text == "{":
+ index_final = tk_match_backet(index_next)
+ index_final_step = tk_advance_no_ws(index_final, 1)
+ if tokens[index_final_step].text == ";":
+ warning("semi-colon after brace '%s () { ... };'" %
tokens[index_kw].text, index_final_step, index_final_step)
def blender_check_kw_else(index_kw):
# for 'else if' use the if check.
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
