[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51674] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sat Oct 27 12:42:30 CEST 2012
Revision: 51674
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51674
Author: campbellbarton
Date: 2012-10-27 10:42:28 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/doc/python_api/rst/info_overview.rst
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/ocean.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenlib/BLI_voronoi.h
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/blenlib/intern/voxel.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/keyingsets.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/util/editmode_undo.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
Modified: trunk/blender/doc/python_api/rst/info_overview.rst
===================================================================
--- trunk/blender/doc/python_api/rst/info_overview.rst 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/doc/python_api/rst/info_overview.rst 2012-10-27 10:42:28 UTC (rev 51674)
@@ -71,7 +71,7 @@
The user preferences addon listing uses **bl_info** to display information about each addon.
-`See Addons <http://wiki.blender.org/index.php/Dev:2.6/Py/Scripts/Guidelines/Addons>`_ for details on the **bl_info** dictionary.
+`See Addons <http://wiki.blender.org/index.php/Dev:2.5/Py/Scripts/Guidelines/Addons>`_ for details on the **bl_info** dictionary.
Integration through Classes
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -612,7 +612,7 @@
}
}
-/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation */
+/* 1 = an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation */
void BKE_undo_step(bContext *C, int step)
{
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -1050,10 +1050,13 @@
MEM_freeN(jend);
}
+/**
+ * \param coord_array Has to be 3 * 4 * pntsu * resolu in size and zero-ed
+ * \param tilt_array set when non-NULL
+ * \param radius_array set when non-NULL
+ */
void BKE_nurb_makeCurve(Nurb *nu, float *coord_array, float *tilt_array, float *radius_array, float *weight_array,
int resolu, int stride)
-/* coord_array has to be 3*4*pntsu*resolu in size and zero-ed
- * tilt_array and radius_array will be written to if valid */
{
BPoint *bp;
float u, ustart, uend, ustep, sumdiv;
Modified: trunk/blender/source/blender/blenkernel/intern/fmodifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fmodifier.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenkernel/intern/fmodifier.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -276,7 +276,7 @@
/* Built-In Function Generator F-Curve Modifier --------------------------- */
/* This uses the general equation for equations:
- * y = amplitude * fn(phase_multiplier*x + phase_offset) + y_offset
+ * y = amplitude * fn(phase_multiplier * x + phase_offset) + y_offset
*
* where amplitude, phase_multiplier/offset, y_offset are user-defined coefficients,
* x is the evaluation 'time', and 'y' is the resultant value
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -1045,7 +1045,7 @@
k = 0; /*current loop/mdisp index within the mloop array*/
- #pragma omp parallel for private(i) if (totloop*gridSize*gridSize >= CCG_OMP_LIMIT)
+ #pragma omp parallel for private(i) if (totloop * gridSize * gridSize >= CCG_OMP_LIMIT)
for (i = 0; i < totpoly; ++i) {
const int numVerts = mpoly[i].totloop;
@@ -1325,7 +1325,7 @@
k = 0; /*current loop/mdisp index within the mloop array*/
- //#pragma omp parallel for private(i) if (dm->numLoopData*gridSize*gridSize >= CCG_OMP_LIMIT)
+ //#pragma omp parallel for private(i) if (dm->numLoopData * gridSize * gridSize >= CCG_OMP_LIMIT)
for (i = 0; i < dm->numPolyData; ++i) {
const int numVerts = mpoly[i].totloop;
@@ -2200,7 +2200,7 @@
dGridSize = multires_side_tot[high_mmd.totlvl];
dSkip = (dGridSize - 1) / (gridSize - 1);
- #pragma omp parallel for private(i) if (me->totface*gridSize*gridSize*4 >= CCG_OMP_LIMIT)
+ #pragma omp parallel for private(i) if (me->totface * gridSize * gridSize * 4 >= CCG_OMP_LIMIT)
for (i = 0; i < me->totpoly; ++i) {
const int numVerts = mpoly[i].totloop;
MDisps *mdisp = &mdisps[mpoly[i].loopstart];
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -423,7 +423,7 @@
return strip->actstart;
}
else {
- /* - the 'fmod(..., actlength*scale)' is needed to get the repeats working
+ /* - the 'fmod(..., actlength * scale)' is needed to get the repeats working
* - the '/ scale' is needed to ensure that scaling influences the timing within the repeat
*/
return strip->actend - fmodf(cframe - strip->start, actlength * scale) / scale;
@@ -446,7 +446,7 @@
return strip->actend;
}
else {
- /* - the 'fmod(..., actlength*scale)' is needed to get the repeats working
+ /* - the 'fmod(..., actlength * scale)' is needed to get the repeats working
* - the '/ scale' is needed to ensure that scaling influences the timing within the repeat
*/
return strip->actstart + fmodf(cframe - strip->start, actlength * scale) / scale;
Modified: trunk/blender/source/blender/blenkernel/intern/ocean.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ocean.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenkernel/intern/ocean.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -475,7 +475,7 @@
if (oc->_do_normals) {
ocr->normal[0] = oc->_N_x[i * oc->_N + j];
- ocr->normal[1] = oc->_N_y /*oc->_N_y[i*oc->_N+j] (MEM01)*/;
+ ocr->normal[1] = oc->_N_y /* oc->_N_y[i * oc->_N + j] (MEM01) */;
ocr->normal[2] = oc->_N_z[i * oc->_N + j];
normalize_v3(ocr->normal);
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -4119,7 +4119,7 @@
int ptype=0;
gzread(gzf, &ptype, sizeof( ptype ));
- if (ptype&readMask) {
+ if (ptype & readMask) {
activeParts++;
gzread(gzf, &(pa->size), sizeof(float));
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -1178,7 +1178,7 @@
fac3 = facf1;
/* formula:
- * fac*(a*b) + (1-fac)*a => fac*a*(b-1)+a
+ * fac * (a * b) + (1 - fac) * a => fac * a * (b - 1) + a
*/
while (y--) {
Modified: trunk/blender/source/blender/blenlib/BLI_voronoi.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_voronoi.h 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenlib/BLI_voronoi.h 2012-10-27 10:42:28 UTC (rev 51674)
@@ -49,7 +49,7 @@
float left[2]; /* point on Voronoi place on the left side of edge */
float right[2]; /* point on Voronoi place on the right side of edge */
- float f, g; /* directional coeffitients satisfying equation y = f*x + g (edge lies on this line) */
+ float f, g; /* directional coeffitients satisfying equation y = f * x + g (edge lies on this line) */
/* some edges consist of two parts, so we add the pointer to another part to connect them at the end of an algorithm */
struct VoronoiEdge *neighbour;
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -2352,10 +2352,10 @@
(st2[0] * st3[1] - st2[1] * st3[0]) + (st3[0] * st0[1] - st3[1] * st0[0]);
/* X is 2D cross product (determinant)
- * A= (p0-p) X (p0-p3)*/
+ * A = (p0 - p) X (p0 - p3)*/
const double a = (st0[0] - st[0]) * (st0[1] - st3[1]) - (st0[1] - st[1]) * (st0[0] - st3[0]);
- /* B= ( (p0-p) X (p1-p2) + (p1-p) X (p0-p3) ) / 2 */
+ /* B = ( (p0 - p) X (p1 - p2) + (p1 - p) X (p0 - p3) ) / 2 */
const double b = 0.5 * (((st0[0] - st[0]) * (st1[1] - st2[1]) - (st0[1] - st[1]) * (st1[0] - st2[0])) +
((st1[0] - st[0]) * (st0[1] - st3[1]) - (st1[1] - st[1]) * (st0[0] - st3[0])));
Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -985,12 +985,12 @@
/* CURRENT STATUS:
- * - eve->f :1= availalble in edges
+ * - eve->f :1 = availalble in edges
* - eve->xs :polynumber
* - eve->h :amount of edges connected to vertex
* - eve->tmp.v :store! original vertex number
*
- * - eed->f :1= boundary edge (optionally set by caller)
+ * - eed->f :1 = boundary edge (optionally set by caller)
* - eed->poly_nr :poly number
*/
Modified: trunk/blender/source/blender/blenlib/intern/voxel.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/voxel.c 2012-10-27 10:22:41 UTC (rev 51673)
+++ trunk/blender/source/blender/blenlib/intern/voxel.c 2012-10-27 10:42:28 UTC (rev 51674)
@@ -117,19 +117,19 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list