[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53620] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Jan 7 04:24:28 CET 2013
Revision: 53620
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53620
Author: campbellbarton
Date: 2013-01-07 03:24:22 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenlib/BLI_scanfill.h
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/bmesh/bmesh_class.h
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2013-01-07 03:24:22 UTC (rev 53620)
@@ -1150,7 +1150,7 @@
fac3 = (int)(256.0f * facf1);
/* formula:
- * fac * (a * b) + (1-fac)*a => fac * a * (b - 1) + axaux = c * px + py * s; //+centx
+ * fac * (a * b) + (1 - fac) * a => fac * a * (b - 1) + axaux = c * px + py * s; //+centx
* yaux = -s * px + c * py; //+centy
*/
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-01-07 03:24:22 UTC (rev 53620)
@@ -3320,7 +3320,7 @@
/*I think this is for interpolating the center vert?*/
- w2 = w; // + numVerts*(g2_wid-1)*(g2_wid-1); //numVerts*((g2_wid-1)*g2_wid+g2_wid-1);
+ w2 = w; // + numVerts*(g2_wid-1) * (g2_wid-1); //numVerts*((g2_wid-1) * g2_wid+g2_wid-1);
DM_interp_vert_data(dm, &ccgdm->dm, vertidx, w2,
numVerts, vertNum);
if (vertOrigIndex) {
Modified: trunk/blender/source/blender/blenlib/BLI_scanfill.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_scanfill.h 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/blenlib/BLI_scanfill.h 2013-01-07 03:24:22 UTC (rev 53620)
@@ -103,7 +103,7 @@
BLI_SCANFILL_CALC_REMOVE_DOUBLES = (1 << 1),
/* note: This flag removes checks for overlapping polygons.
- * when this flag is set, we'll never get back more faces then (totvert - 2)*/
+ * when this flag is set, we'll never get back more faces then (totvert - 2) */
BLI_SCANFILL_CALC_HOLES = (1 << 2)
};
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2013-01-07 03:24:22 UTC (rev 53620)
@@ -1817,7 +1817,7 @@
return 1;
}
-/*mama (knowing the squared length of the normal)*/
+/*mama (knowing the squared length of the normal) */
static int point_in_slice_m(float p[3], float origin[3], float normal[3], float lns)
{
float h, rp[3];
Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h 2013-01-07 03:24:22 UTC (rev 53620)
@@ -184,10 +184,10 @@
* BM_LOOP isn't handled so far. */
char elem_index_dirty;
- /*element pools*/
+ /* element pools */
struct BLI_mempool *vpool, *epool, *lpool, *fpool;
- /*operator api stuff (must be all NULL or all alloc'd)*/
+ /* operator api stuff (must be all NULL or all alloc'd) */
struct BLI_mempool *vtoolflagpool, *etoolflagpool, *ftoolflagpool;
int stackdepth;
@@ -205,7 +205,7 @@
* Only use when the edit mesh cant be accessed - campbell */
short selectmode;
- /*ID of the shape key this bmesh came from*/
+ /* ID of the shape key this bmesh came from */
int shapenr;
int walkers, totflags;
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2013-01-07 03:24:22 UTC (rev 53620)
@@ -172,7 +172,7 @@
#endif
/* use a small value rather then zero so we don't flip a face in multiple steps
- * (first making it zero area, then flipping again)*/
+ * (first making it zero area, then flipping again) */
if (dot_v3v3(cross_exist, cross_optim) <= FLT_EPSILON) {
//printf("no flip\n");
return TRUE;
Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c 2013-01-07 03:24:22 UTC (rev 53620)
@@ -237,7 +237,7 @@
{
int i;
- channels->timeAtFrame = MEM_callocN((channels->length+1)*sizeof(float), "timeAtFrame channel");
+ channels->timeAtFrame = MEM_callocN((channels->length + 1) * sizeof(float), "timeAtFrame channel");
channels->timeAtFrame[0] = channels->timeAtFrame[1] = domainSettings->animStart; // start at index 1
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2013-01-07 03:24:22 UTC (rev 53620)
@@ -712,7 +712,7 @@
else {
/* validate owner */
//if (ri->rect == NULL)
- // ri->rect= MEM_mallocN(sizeof(int)*ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
+ // ri->rect= MEM_mallocN(sizeof(int) * ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
//RE_ResultGet32(re, ri->rect);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-01-07 03:24:22 UTC (rev 53620)
@@ -937,7 +937,7 @@
}
/* color depends on whether there is a keyframe */
- if (id_frame_has_keyframe((ID *)ob, /*BKE_scene_frame_get(scene)*/ (float)(CFRA), ANIMFILTER_KEYS_LOCAL))
+ if (id_frame_has_keyframe((ID *)ob, /* BKE_scene_frame_get(scene) */ (float)(CFRA), ANIMFILTER_KEYS_LOCAL))
UI_ThemeColor(TH_VERTEX_SELECT);
else
UI_ThemeColor(TH_TEXT_HI);
@@ -3036,10 +3036,10 @@
for (x = 0; x < XTOT - 1; x++) {
for (y = 0; y < YTOT - 1; y++) {
- indices[x][y][0] = x*XTOT + y;
- indices[x][y][1] = x*XTOT + y + 1;
- indices[x][y][2] = (x + 1)*XTOT + y + 1;
- indices[x][y][3] = (x + 1)*XTOT + y;
+ indices[x][y][0] = x * XTOT + y;
+ indices[x][y][1] = x * XTOT + y + 1;
+ indices[x][y][2] = (x + 1) * XTOT + y + 1;
+ indices[x][y][3] = (x + 1) * XTOT + y;
}
}
@@ -3089,7 +3089,7 @@
glVertexPointer(2, GL_FLOAT, 0, grid_pos);
glColorPointer(4, GL_UNSIGNED_BYTE, 0, grid_col);
- glDrawElements(GL_QUADS, (XTOT - 1)*(YTOT - 1)*4, GL_UNSIGNED_SHORT, indices);
+ glDrawElements(GL_QUADS, (XTOT - 1) * (YTOT - 1) * 4, GL_UNSIGNED_SHORT, indices);
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_COLOR_ARRAY);
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp 2013-01-07 02:32:57 UTC (rev 53619)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp 2013-01-07 03:24:22 UTC (rev 53620)
@@ -1015,7 +1015,7 @@
vec2[2] = oz1 - dda_lambda * doz;
calc_ocval_ray(&ocval, (float)xo, (float)yo, (float)zo, vec1, vec2);
- //is->dist = (u1+dda_lambda*(u2-u1))*o_lambda;
+ //is->dist = (u1 + dda_lambda * (u2 - u1)) * o_lambda;
if (testnode(oc, is, no, ocval) )
found = 1;
More information about the Bf-blender-cvs
mailing list