Revision: 46704
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46704
Author: campbellbarton
Date: 2012-05-16 23:37:23 +0000 (Wed, 16 May 2012)
Log Message:
-----------
style cleanup: block comments
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_ccg.h
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
trunk/blender/source/blender/bmesh/operators/bmo_hull.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/rna_armature.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
Modified: trunk/blender/source/blender/blenkernel/BKE_ccg.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_ccg.h 2012-05-16 22:27:45 UTC
(rev 46703)
+++ trunk/blender/source/blender/blenkernel/BKE_ccg.h 2012-05-16 23:37:23 UTC
(rev 46704)
@@ -38,11 +38,11 @@
struct CCGSubSurf;
/* Each CCGElem is CCGSubSurf's representation of a subdivided
- vertex. All CCGElems in a particular CCGSubSurf have the same
- layout, but the layout can vary from one CCGSubSurf to another. For
- this reason, CCGElem is presented as an opaque pointer, and
- elements should always be accompanied by a CCGKey, which provides
- the necessary offsets to access components of a CCGElem.
+ * vertex. All CCGElems in a particular CCGSubSurf have the same
+ * layout, but the layout can vary from one CCGSubSurf to another. For
+ * this reason, CCGElem is presented as an opaque pointer, and
+ * elements should always be accompanied by a CCGKey, which provides
+ * the necessary offsets to access components of a CCGElem.
*/
typedef struct CCGElem CCGElem;
@@ -50,7 +50,7 @@
int level;
/* number of bytes in each element (one float per layer, plus
- three floats for normals if enabled) */
+ * three floats for normals if enabled) */
int elem_size;
/* number of elements along each side of grid */
@@ -61,11 +61,11 @@
int grid_bytes;
/* currently always the last three floats, unless normals are
- disabled */
+ * disabled */
int normal_offset;
/* offset in bytes of mask value; only valid if 'has_mask' is
- true */
+ * true */
int mask_offset;
int num_layers;
Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_customdata.h 2012-05-16
22:27:45 UTC (rev 46703)
+++ trunk/blender/source/blender/blenkernel/BKE_customdata.h 2012-05-16
23:37:23 UTC (rev 46704)
@@ -261,8 +261,8 @@
void CustomData_bmesh_set_n(struct CustomData *data, void *block, int type,
int n,
void *source);
-/*sets the data of the block at physical layer n. no real type checking
- *is performed.
+/* sets the data of the block at physical layer n. no real type checking
+ * is performed.
*/
void CustomData_bmesh_set_layer_n(struct CustomData *data, void *block, int n,
void *source);
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-05-16
22:27:45 UTC (rev 46703)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-05-16
23:37:23 UTC (rev 46704)
@@ -3127,7 +3127,7 @@
key->num_layers = ss->meshIFC.numLayers;
/* if normals are present, always the last three floats of an
- element */
+ * element */
if (key->has_normals)
key->normal_offset = key->elem_size - sizeof(float) * 3;
else
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-05-16
22:27:45 UTC (rev 46703)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-05-16
23:37:23 UTC (rev 46704)
@@ -92,7 +92,7 @@
/* ********** cloth engine ******* */
/* Prototypes for internal functions.
-*/
+ */
static void cloth_to_object (Object *ob, ClothModifierData *clmd, float
(*vertexCos)[3]);
static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm );
static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh
*dm, float framenr, int first);
@@ -101,10 +101,10 @@
/******************************************************************************
-*
-* External interface called by modifier.c clothModifier functions.
-*
-******************************************************************************/
+ *
+ * External interface called by modifier.c clothModifier functions.
+ *
+
******************************************************************************/
/**
* cloth_init - creates a new cloth simulation.
*
@@ -145,8 +145,8 @@
clmd->coll_parms->selfepsilon = 0.75;
/* These defaults are copied from softbody.c's
- * softbody_calc_forces() function.
- */
+ * softbody_calc_forces() function.
+ */
clmd->sim_parms->eff_force_scale = 1000.0;
clmd->sim_parms->eff_wind_scale = 250.0;
@@ -476,7 +476,7 @@
/************************************************
* clothModifier_do - main simulation function
-************************************************/
+ ************************************************/
void clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob,
DerivedMesh *dm, float (*vertexCos)[3])
{
PointCache *cache;
@@ -729,10 +729,10 @@
}
/******************************************************************************
-*
-* Internal functions.
-*
-******************************************************************************/
+ *
+ * Internal functions.
+ *
+
******************************************************************************/
/**
* cloth_to_object - copies the deformed vertices to the object.
@@ -978,16 +978,16 @@
memcpy ( &clmd->clothObject->mfaces[i], &mface[i], sizeof (
MFace ) );
/* Free the springs since they can't be correct if the vertices
- * changed.
- */
+ * changed.
+ */
if ( clmd->clothObject->springs != NULL )
MEM_freeN ( clmd->clothObject->springs );
}
/***************************************************************************************
-* SPRING NETWORK BUILDING IMPLEMENTATION BEGIN
-***************************************************************************************/
+ * SPRING NETWORK BUILDING IMPLEMENTATION BEGIN
+
***************************************************************************************/
// be careful: implicit solver has to be resettet when using this one!
// --> only for implicit handling of this spring!
@@ -1276,6 +1276,6 @@
} /* cloth_build_springs */
/***************************************************************************************
-* SPRING NETWORK BUILDING IMPLEMENTATION END
-***************************************************************************************/
+ * SPRING NETWORK BUILDING IMPLEMENTATION END
+
***************************************************************************************/
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-16
22:27:45 UTC (rev 46703)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-16
23:37:23 UTC (rev 46704)
@@ -2047,7 +2047,7 @@
normalize_v3(vec_2);
/* align the vector, can avoid this and it looks 98% OK but
- * better to align the angle quat roll's before comparing */
+ * better to align the angle quat roll's before comparing */
{
cross_v3_v3v3(cross_tmp, bevp_last->dir,
bevp_first->dir);
angle = angle_normalized_v3v3(bevp_first->dir,
bevp_last->dir);
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2012-05-16
22:27:45 UTC (rev 46703)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2012-05-16
23:37:23 UTC (rev 46704)
@@ -275,8 +275,8 @@
dw = &dvert->dw[i]; /* in case array got
realloced */
/* distribute weights: if only one of the
vertex groups was
- * assigned this will halve the weights,
otherwise it gets
- * evened out. this keeps it proportional to
other groups */
+ * assigned this will halve the weights,
otherwise it gets
+ * evened out. this keeps it proportional to
other groups */
weight = 0.5f * (dw_cpy->weight + dw->weight);
dw_cpy->weight = weight;
dw->weight = weight;
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-05-16
22:27:45 UTC (rev 46703)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-05-16
23:37:23 UTC (rev 46704)
@@ -1253,7 +1253,7 @@
int maxpos = 0;
/* int is_cycle = 0; */ /* UNUSED */
/*
- *fprintf(stderr, "starting DFS\n ------------\n");
+ *fprintf(stderr, "starting DFS\n ------------\n");
*/
nqueue = queue_create(DAGQUEUEALLOC);
retqueue = queue_create(MainDag->numNodes);
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-05-16 22:27:45 UTC (rev 46703)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-05-16 23:37:23 UTC (rev 46704)
@@ -140,7 +140,7 @@
int *s_pos; /* (x*y*z) t_index begin id */
int *s_num; /* (x*y*z) number of t_index points */
int *t_index; /* actual surface point index,
- access: (s_pos+s_num) */
+ * access: (s_pos+s_num) */
} VolumeGrid;
typedef struct Vec3f {
@@ -192,7 +192,7 @@
unsigned int v1, v2, v3; /* vertex indexes */
unsigned int neighbour_pixel; /* If this pixel isn't uv mapped to any
face,
- but it's neighboring pixel is */
+ * but it's neighboring pixel is */
short quad;
} PaintUVPoint;
@@ -205,9 +205,9 @@
#define ADJ_ON_MESH_EDGE (1 << 0)
typedef struct PaintAdjData {
- int *n_target; /* array of neighboring point indexes,
- for single sample use
(n_index+neigh_num) */
- int *n_index; /* index to start reading n_target for each point */
+ int *n_target; /* array of neighboring point indexes,
+ * for single sample use (n_index + neigh_num) */
+ int *n_index; /* index to start reading n_target for each point */
int *n_num; /* num of neighs for each point */
int *flags; /* vertex adjacency flags */
int total_targets; /* size of n_target */
@@ -2540,8 +2540,8 @@
#if 0
/*
-----------------------------------------------------------------
- * For debug, output pixel statuses to the color map
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
