[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55609] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Tue Mar 26 23:45:06 CET 2013
Revision: 55609
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55609
Author: campbellbarton
Date: 2013-03-26 22:45:06 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2013-03-26 22:37:41 UTC (rev 55608)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2013-03-26 22:45:06 UTC (rev 55609)
@@ -628,17 +628,17 @@
*
* Examples:
*
- * FOREACH_NODETREE(bmain, nodetree)
+ * FOREACH_NODETREE(bmain, nodetree) {
* if (id == nodetree)
* printf("This is a linkable node tree");
- * FOREACH_NODETREE_END
+ * } FOREACH_NODETREE_END
*
- * FOREACH_NODETREE(bmain, nodetree)
+ * FOREACH_NODETREE(bmain, nodetree) {
* if (nodetree->idname == "ShaderNodeTree")
* printf("This is a shader node tree);
* if (GS(id) == ID_MA)
* printf(" and it's owned by a material");
- * FOREACH_NODETREE_END
+ * } FOREACH_NODETREE_END
*/
/* should be an opaque type, only for internal use by BKE_node_tree_iter_*** */
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2013-03-26 22:37:41 UTC (rev 55608)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2013-03-26 22:45:06 UTC (rev 55609)
@@ -525,8 +525,7 @@
float radius = 1.0f; /* Quite warnings */
float co[3];
- if (mtex->brush_map_mode == MTEX_MAP_MODE_VIEW)
- {
+ if (mtex->brush_map_mode == MTEX_MAP_MODE_VIEW) {
/* keep coordinates relative to mouse */
rotation += ups->brush_rotation;
@@ -545,7 +544,8 @@
x = point_2d[0];
y = point_2d[1];
- } else if (mtex->brush_map_mode == MTEX_MAP_MODE_RANDOM) {
+ }
+ else if (mtex->brush_map_mode == MTEX_MAP_MODE_RANDOM) {
rotation += ups->brush_rotation;
/* these contain a random coordinate */
x = point_2d[0] - ups->tex_mouse[0];
@@ -992,11 +992,12 @@
}
}
-void BKE_brush_randomize_texture_coordinates(UnifiedPaintSettings *ups) {
+void BKE_brush_randomize_texture_coordinates(UnifiedPaintSettings *ups)
+{
/* we multiply with brush radius as an optimization for the brush
* texture sampling functions */
- ups->tex_mouse[0] = BLI_rng_get_float(brush_rng)*ups->pixel_radius;
- ups->tex_mouse[1] = BLI_rng_get_float(brush_rng)*ups->pixel_radius;
+ ups->tex_mouse[0] = BLI_rng_get_float(brush_rng) * ups->pixel_radius;
+ ups->tex_mouse[1] = BLI_rng_get_float(brush_rng) * ups->pixel_radius;
}
/* Uses the brush curve control to find a strength value between 0 and 1 */
@@ -1039,7 +1040,7 @@
texcache = MEM_callocN(sizeof(int) * side * side, "Brush texture cache");
- /*do normalized cannonical view coords for texture*/
+ /* do normalized cannonical view coords for texture */
for (y = -1.0, iy = 0; iy < side; iy++, y += step) {
for (x = -1.0, ix = 0; ix < side; ix++, x += step) {
co[0] = x;
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2013-03-26 22:37:41 UTC (rev 55608)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2013-03-26 22:45:06 UTC (rev 55609)
@@ -1653,7 +1653,7 @@
}
-static short bevelinside(BevList *bl1, BevList *bl2)
+static bool bevelinside(BevList *bl1, BevList *bl2)
{
/* is bl2 INSIDE bl1 ? with left-right method and "lambda's" */
/* returns '1' if correct hole */
@@ -1701,9 +1701,7 @@
bevp++;
}
- if ( (links & 1) && (rechts & 1) )
- return 1;
- return 0;
+ return (links & 1) && (rechts & 1);
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-26 22:37:41 UTC (rev 55608)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-26 22:45:06 UTC (rev 55609)
@@ -8685,7 +8685,7 @@
/* Fix for bug #32982, internal_links list could get corrupted from r51630 onward.
* Simply remove bad internal_links lists to avoid NULL pointers.
*/
- FOREACH_NODETREE(main, ntree, id)
+ FOREACH_NODETREE(main, ntree, id) {
bNode *node;
bNodeLink *link, *nextlink;
@@ -8697,7 +8697,7 @@
}
}
}
- FOREACH_NODETREE_END
+ } FOREACH_NODETREE_END
}
if (main->versionfile < 264 || (main->versionfile == 264 && main->subversionfile < 6)) {
More information about the Bf-blender-cvs
mailing list