[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45846] trunk/blender/source/blender: style cleanup: comments
Campbell Barton
ideasman42 at gmail.com
Sun Apr 22 13:54:53 CEST 2012
Revision: 45846
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45846
Author: campbellbarton
Date: 2012-04-22 11:54:53 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
style cleanup: comments
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/BKE_subsurf.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/paint.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/BLI_pbvh.h
trunk/blender/source/blender/blenlib/intern/fnmatch.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/bmesh/operators/bmo_slide.c
trunk/blender/source/blender/editors/include/ED_numinput.h
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_update.c
trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_key.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_meta.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2012-04-22 11:54:53 UTC (rev 45846)
@@ -112,7 +112,7 @@
const struct MLoop *mloop, unsigned vert);
/* update the hide flag for edges and polys from the corresponding
- flag in verts */
+ * flag in verts */
void mesh_flush_hidden_from_verts(const struct MVert *mvert,
const struct MLoop *mloop,
struct MEdge *medge, int totedge,
Modified: trunk/blender/source/blender/blenkernel/BKE_subsurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2012-04-22 11:54:53 UTC (rev 45846)
@@ -68,7 +68,7 @@
int ccg_gridsize(int level);
/* x/y grid coordinates at 'low_level' can be multiplied by the result
- of this function to convert to grid coordinates at 'high_level' */
+ * of this function to convert to grid coordinates at 'high_level' */
int ccg_factor(int low_level, int high_level);
void subsurf_copy_grid_hidden(struct DerivedMesh *dm,
@@ -78,7 +78,7 @@
typedef enum MultiresModifiedFlags {
/* indicates the grids have been sculpted on, so MDisps
- have to be updated */
+ * have to be updated */
MULTIRES_COORDS_MODIFIED = 1,
/* indicates elements have been hidden or unhidden */
MULTIRES_HIDDEN_MODIFIED = 2
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -2137,7 +2137,7 @@
if ((ob->mode & OB_MODE_SCULPT) && ob->sculpt) {
/* create PBVH immediately (would be created on the fly too,
- but this avoids waiting on first stroke) */
+ * but this avoids waiting on first stroke) */
ob->sculpt->pbvh= ob->derivedFinal->getPBVH(ob, ob->derivedFinal);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -701,14 +701,17 @@
GPU_normal_setup( dm );
GPU_uv_setup( dm );
if ( col != NULL ) {
- /*if ( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) {
+#if 0
+ if ( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) {
col = 0;
}
else if ( mcol && dm->drawObject->colType == CD_MCOL ) {
col = 0;
}
- if ( col != 0 ) {*/
+ if ( col != 0 )
+#endif
+ {
unsigned char *colors = MEM_mallocN(dm->getNumTessFaces(dm)*4*3*sizeof(unsigned char), "cdDM_drawFacesTex_common");
for ( i=0; i < dm->getNumTessFaces(dm); i++ ) {
for ( j=0; j < 4; j++ ) {
@@ -724,7 +727,7 @@
dm->drawObject->colType = CD_TEXTURE_MCOL;
else if (mcol)
dm->drawObject->colType = CD_MCOL;
- //}
+ }
GPU_color_setup( dm );
}
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -2167,7 +2167,7 @@
int t;
/* copy old layer description so that old data can be copied into
- the new allocation */
+ * the new allocation */
destold = *dest;
if (destold.layers) destold.layers = MEM_dupallocN(destold.layers);
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -1309,11 +1309,11 @@
/* is_cycle = 1; */ /* UNUSED */
}
else if (itA->node->color == DAG_BLACK) {
- ;
/* already processed node but we may want later to change distance either to shorter to longer.
* DFS_dist is the first encounter
*/
- /*if (node->DFS_dist >= itA->node->DFS_dist)
+#if 0
+ if (node->DFS_dist >= itA->node->DFS_dist)
itA->node->DFS_dist = node->DFS_dist + 1;
fprintf(stderr,"dfs forward or cross edge :%15s %i-%i %15s %i-%i\n",
@@ -1323,7 +1323,7 @@
((ID *) itA->node->ob)->name,
itA->node->DFS_dvtm,
itA->node->DFS_fntm);
- */
+#endif
}
else
fprintf(stderr,"dfs unknown edge\n");
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -1424,9 +1424,9 @@
#define HAIR_GRID_INDEX(vec, min, max, axis) (int)((vec[axis] - min[axis]) / (max[axis] - min[axis]) * 9.99f)
/* Smoothing of hair velocities:
* adapted from
- Volumetric Methods for Simulation and Rendering of Hair
- by Lena Petrovic, Mark Henne and John Anderson
- * Pixar Technical Memo #06-08, Pixar Animation Studios
+ * Volumetric Methods for Simulation and Rendering of Hair
+ * by Lena Petrovic, Mark Henne and John Anderson
+ * Pixar Technical Memo #06-08, Pixar Animation Studios
*/
static void hair_velocity_smoothing(ClothModifierData *clmd, lfVector *lF, lfVector *lX, lfVector *lV, unsigned int numverts)
{
@@ -1591,8 +1591,8 @@
hair_velocity_smoothing(clmd, lF, lX, lV, numverts);
/* multiply lF with mass matrix
- // force = mass * acceleration (in this case: gravity)
- */
+ * force = mass * acceleration (in this case: gravity)
+ */
for (i = 0; i < numverts; i++)
{
float temp[3];
@@ -1745,10 +1745,10 @@
del_lfvector(dFdXmV);
}
-/*computes where the cloth would be if it were subject to perfectly stiff edges
- (edge distance constraints) in a lagrangian solver. then add forces to help
- guide the implicit solver to that state. this function is called after
- collisions*/
+/* computes where the cloth would be if it were subject to perfectly stiff edges
+ * (edge distance constraints) in a lagrangian solver. then add forces to help
+ * guide the implicit solver to that state. this function is called after
+ * collisions*/
int cloth_calc_helper_forces(Object *UNUSED(ob), ClothModifierData * clmd, float (*initial_cos)[3], float UNUSED(step), float dt)
{
Cloth *cloth= clmd->clothObject;
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -3038,7 +3038,7 @@
}
/* update the hide flag for edges and faces from the corresponding
- flag in verts */
+ * flag in verts */
void mesh_flush_hidden_from_verts(const MVert *mvert,
const MLoop *mloop,
MEdge *medge, int totedge,
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -104,7 +104,7 @@
int hi_level,
/* assumed to be at hi_level (or
- null) */
+ * null) */
BLI_bitmap prev_hidden)
{
BLI_bitmap subd;
@@ -144,8 +144,8 @@
if (prev_hidden) {
/* If prev_hidden is available, copy it to
- subd, except when the equivalent element in
- lo_hidden is different */
+ * subd, except when the equivalent element in
+ * lo_hidden is different */
if (lo_val != prev_hidden[hi_ndx])
BLI_BITMAP_MODIFY(subd, hi_ndx, lo_val);
else
@@ -215,7 +215,7 @@
}
/* subdivide mdisps.hidden if needed (assumes that md.level reflects
- the current level of md.hidden) */
+ * the current level of md.hidden) */
static void multires_mdisps_subdivide_hidden(MDisps *md, int new_level)
{
BLI_bitmap subd;
Modified: trunk/blender/source/blender/blenkernel/intern/paint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/paint.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/paint.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -151,7 +151,7 @@
}
/* returns non-zero if any of the face's vertices
- are hidden, zero otherwise */
+ * are hidden, zero otherwise */
int paint_is_face_hidden(const MFace *f, const MVert *mvert)
{
return ((mvert[f->v1].flag & ME_HIDE) ||
@@ -161,8 +161,8 @@
}
/* returns non-zero if any of the corners of the grid
- face whose inner corner is at (x,y) are hidden,
- zero otherwise */
+ * face whose inner corner is at (x,y) are hidden,
+ * zero otherwise */
int paint_is_grid_face_hidden(const unsigned int *grid_hidden,
int gridsize, int x, int y)
{
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-04-22 11:23:17 UTC (rev 45845)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-04-22 11:54:53 UTC (rev 45846)
@@ -1781,7 +1781,7 @@
/* BOX WIPE IS NOT WORKING YET */
/* case DO_CROSS_WIPE: */
/* BOX WIPE IS NOT WORKING YET */
- /*
+#if 0
case DO_BOX_WIPE:
if (invert)facf0 = 1-facf0;
@@ -1843,7 +1843,7 @@
}
break;
-*/
+#endif
case DO_IRIS_WIPE:
if (xo > yo) yo = xo;
else xo = yo;
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list