[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57264] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Thu Jun 6 08:02:47 CEST 2013
Revision: 57264
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57264
Author: campbellbarton
Date: 2013-06-06 06:02:46 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/test/simpletest/memtest.c
trunk/blender/source/blender/blenkernel/intern/paint.c
trunk/blender/source/blender/blenlib/intern/math_vector.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/intern/guardedalloc/test/simpletest/memtest.c
===================================================================
--- trunk/blender/intern/guardedalloc/test/simpletest/memtest.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/intern/guardedalloc/test/simpletest/memtest.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -47,7 +47,7 @@
fflush(stderr);
}
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
{
int verbose = 0;
int error_status = 0;
Modified: trunk/blender/source/blender/blenkernel/intern/paint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/paint.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/blenkernel/intern/paint.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -65,7 +65,7 @@
static OverlayControlFlags overlay_flags = 0;
-void BKE_paint_invalidate_overlay_tex (Scene *scene, const Tex *tex)
+void BKE_paint_invalidate_overlay_tex(Scene *scene, const Tex *tex)
{
Paint *p = BKE_paint_get_active(scene);
Brush *br = p->brush;
@@ -79,7 +79,7 @@
overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY;
}
-void BKE_paint_invalidate_cursor_overlay (Scene *scene, CurveMapping *curve)
+void BKE_paint_invalidate_cursor_overlay(Scene *scene, CurveMapping *curve)
{
Paint *p = BKE_paint_get_active(scene);
Brush *br = p->brush;
Modified: trunk/blender/source/blender/blenlib/intern/math_vector.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/blenlib/intern/math_vector.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -133,7 +133,7 @@
* Specialized function for calculating normals.
* fastpath for:
*
-* \code{.c}
+ * \code{.c}
* add_v3_v3v3(r, a, b);
* normalize_v3(r)
* mul_v3_fl(r, angle_normalized_v3v3(a, b) / M_PI_2);
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -9350,10 +9350,10 @@
}
/* TIP: to initialize new variables added, use the new function
- DNA_struct_elem_find(fd->filesdna, "structname", "typename", "varname")
- example:
- if (!DNA_struct_elem_find(fd->filesdna, "UserDef", "short", "image_gpubuffer_limit"))
- user->image_gpubuffer_limit = 10;
+ * DNA_struct_elem_find(fd->filesdna, "structname", "typename", "varname")
+ * example:
+ * if (!DNA_struct_elem_find(fd->filesdna, "UserDef", "short", "image_gpubuffer_limit"))
+ * user->image_gpubuffer_limit = 10;
*/
}
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -1546,7 +1546,7 @@
return items;
}
-static size_t animdata_filter_ds_linestyle (bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode)
+static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode)
{
SceneRenderLayer *srl;
size_t items = 0;
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -1739,7 +1739,7 @@
case OB_MESH:
ob->data = me = BKE_mesh_copy(ob->data);
if (me->key)
- BKE_copy_animdata_id_action((ID*)me->key);
+ BKE_copy_animdata_id_action((ID *)me->key);
break;
case OB_MBALL:
ob->data = BKE_mball_copy(ob->data);
@@ -1751,12 +1751,12 @@
ID_NEW(cu->bevobj);
ID_NEW(cu->taperobj);
if (cu->key)
- BKE_copy_animdata_id_action((ID*)cu->key);
+ BKE_copy_animdata_id_action((ID *)cu->key);
break;
case OB_LATTICE:
ob->data = lat = BKE_lattice_copy(ob->data);
if (lat->key)
- BKE_copy_animdata_id_action((ID*)lat->key);
+ BKE_copy_animdata_id_action((ID *)lat->key);
break;
case OB_ARMATURE:
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
@@ -1777,7 +1777,7 @@
* AnimData structure, which is not what we want.
* (sergey)
*/
- BKE_copy_animdata_id_action((ID*)ob->data);
+ BKE_copy_animdata_id_action((ID *)ob->data);
id->us--;
id->newid = ob->data;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -583,12 +583,13 @@
undo_paint_push_end(UNDO_PAINT_IMAGE);
- /* duplicate warning, see texpaint_init
+ /* duplicate warning, see texpaint_init */
+#if 0
if (pop->s.warnmultifile)
BKE_reportf(op->reports, RPT_WARNING, "Image requires 4 color channels to paint: %s", pop->s.warnmultifile);
if (pop->s.warnpackedfile)
BKE_reportf(op->reports, RPT_WARNING, "Packed MultiLayer files cannot be painted: %s", pop->s.warnpackedfile);
- */
+#endif
MEM_freeN(pop);
{
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -2722,7 +2722,7 @@
if (unit->system) {
bUnit_AsString(numstr, sizeof(numstr), len_v3v3(v1, v2) * unit->scale_length, 3,
- unit->system, B_UNIT_LENGTH, do_split, false);
+ unit->system, B_UNIT_LENGTH, do_split, false);
}
else {
BLI_snprintf(numstr, sizeof(numstr), conv_float, len_v3v3(v1, v2));
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -883,10 +883,10 @@
short offset = 1.5f * UI_UNIT_X + rect->xmin;
/*
- * breadcrumbs can contain 3 object names (MAX_NAME)
- * and 2 BREAD_CRUMB_SEPARATORs (6)
- * and a SHAPE_KEY_PINNED marker and a trailing '\0' (9+1)
- */
+ * breadcrumbs can contain 3 object names (MAX_NAME)
+ * and 2 BREAD_CRUMB_SEPARATORs (6)
+ * and a SHAPE_KEY_PINNED marker and a trailing '\0' (9+1)
+ */
char bread_crumbs[3 * MAX_NAME + 6 + 10];
bread_crumbs[0] = '\0';
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -1564,7 +1564,7 @@
glPointSize(1.0);
}
-static UvEdge *uv_edge_get (BMLoop *l, StitchState *state)
+static UvEdge *uv_edge_get(BMLoop *l, StitchState *state)
{
UvEdge tmp_edge;
Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -1276,7 +1276,7 @@
unsigned int tot_tri, tot_quad;
/* The PBVH ensures that either all faces in the node are
- smooth-shaded or all faces are flat-shaded */
+ * smooth-shaded or all faces are flat-shaded */
int smooth;
int show_diffuse_color;
@@ -1392,8 +1392,8 @@
if (vert_data) {
/* Vertex data is shared if smooth-shaded, but separate
- copies are made for flat shading because normals
- shouldn't be shared. */
+ * copies are made for flat shading because normals
+ * shouldn't be shared. */
if (buffers->smooth) {
for (i = 0; i < totvert; ++i) {
MVert *v = mvert + vert_indices[i];
@@ -1518,8 +1518,8 @@
}
/* An element index buffer is used for smooth shading, but flat
- shading requires separate vertex normals so an index buffer is
- can't be used there. */
+ * shading requires separate vertex normals so an index buffer is
+ * can't be used there. */
if (gpu_vbo_enabled() && buffers->smooth)
glGenBuffersARB(1, &buffers->index_buf);
@@ -1941,7 +1941,7 @@
}
/* Creates a vertex buffer (coordinate, normal, color) and, if smooth
- shading, an element index buffer. */
+ * shading, an element index buffer. */
void GPU_update_bmesh_buffers(GPU_Buffers *buffers,
BMesh *bm,
GHash *bm_faces,
@@ -1982,7 +1982,7 @@
if (buffers->smooth) {
/* Vertices get an index assigned for use in the triangle
- index buffer */
+ * index buffer */
bm->elem_index_dirty |= BM_VERT;
GHASH_ITER (gh_iter, bm_unique_verts) {
Modified: trunk/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_define.c 2013-06-06 05:48:16 UTC (rev 57263)
+++ trunk/blender/source/blender/makesrna/intern/rna_define.c 2013-06-06 06:02:46 UTC (rev 57264)
@@ -521,8 +521,8 @@
for (a = 0; kwlist_prop[a]; a++) {
if (strcmp(identifier, kwlist_prop[a]) == 0) {
/* this keyword is reserved by python.
- * just replace the last character by '_' to keep it readable.
- */
+ * just replace the last character by '_' to keep it readable.
+ */
identifier[strlen(identifier) - 1] = '_';
break;
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list