[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59060] trunk/blender/source: use 'greater /less then or equal to' operators rather then adding 1.
Campbell Barton
ideasman42 at gmail.com
Sun Aug 11 07:40:36 CEST 2013
Revision: 59060
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59060
Author: campbellbarton
Date: 2013-08-11 05:40:35 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
use 'greater/less then or equal to' operators rather then adding 1.
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/blenfont/intern/blf_glyph.c
trunk/blender/source/blender/blenkernel/intern/mask.c
trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/mask/mask_draw.c
trunk/blender/source/blender/editors/mask/mask_ops.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp
trunk/blender/source/blender/freestyle/intern/stroke/StrokeRep.cpp
trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
trunk/blender/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/avi/intern/avi.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -975,7 +975,7 @@
/* Allocate the new memory for the index entry */
- if (frame_num + 1 > movie->index_entries) {
+ if (frame_num >= movie->index_entries) {
const size_t entry_size = (movie->header->Streams + 1) * sizeof(AviIndexEntry);
movie->entries = (AviIndexEntry *)MEM_recallocN(movie->entries, (frame_num + 1) * entry_size);
movie->index_entries = frame_num + 1;
Modified: trunk/blender/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -152,7 +152,7 @@
}
}
- if (gc->cur_tex + 1 > 0)
+ if (gc->cur_tex > -1)
glDeleteTextures(gc->cur_tex + 1, gc->textures);
MEM_freeN((void *)gc->textures);
MEM_freeN(gc);
Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -602,7 +602,7 @@
float cur_u = 0.0f, cur_w = 0.0f, next_u = 0.0f, next_w = 0.0f, fac; /* Quite warnings */
int i;
- for (i = 0; i < point->tot_uw + 1; i++) {
+ for (i = 0; i <= point->tot_uw; i++) {
if (i == 0) {
cur_u = 0.0f;
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -349,7 +349,7 @@
{
KDTreeNearest *to;
- if (found + 1 > *totfoundstack) {
+ if (found >= *totfoundstack) {
KDTreeNearest *temp = MEM_callocN((*totfoundstack + 50) * sizeof(KDTreeNode), "psys_treefoundstack");
memcpy(temp, *ptn, *totfoundstack * sizeof(KDTreeNearest));
if (*ptn)
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -593,7 +593,7 @@
}
for (i = 1; i < numcuts + 2; i++) {
- for (j = 1; j < numcuts + 1; j++) {
+ for (j = 1; j <= numcuts; j++) {
a = i * s + j;
b = (i - 1) * s + j;
e = connect_smallest_face(bm, lines[a], lines[b], &f_new);
@@ -710,7 +710,7 @@
* s s
* </pre>
*/
- for (i = 1; i < numcuts + 1; i++) {
+ for (i = 1; i <= numcuts; i++) {
for (j = 0; j < i; j++) {
e = connect_smallest_face(bm, lines[i][j], lines[i + 1][j + 1], &f_new);
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -561,7 +561,7 @@
glColor4f(1.f, 1.f, 1.f, 0.08f);
/* draw grid lines here */
- for (i = 1; i < (HISTOGRAM_TOT_GRID_LINES + 1); i++) {
+ for (i = 1; i <= HISTOGRAM_TOT_GRID_LINES; i++) {
const float fac = (float)i / (float)HISTOGRAM_TOT_GRID_LINES;
/* so we can tell the 1.0 color point */
Modified: trunk/blender/source/blender/editors/mask/mask_draw.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_draw.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/editors/mask/mask_draw.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -165,7 +165,7 @@
int j;
- for (j = 0; j < point->tot_uw + 1; j++) {
+ for (j = 0; j <= point->tot_uw; j++) {
float feather_point[2];
int sel = FALSE;
Modified: trunk/blender/source/blender/editors/mask/mask_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_ops.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/editors/mask/mask_ops.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -197,7 +197,7 @@
int j;
MaskSplinePoint *cur_point = &spline->points[i];
- for (j = 0; j < cur_point->tot_uw + 1; j++) {
+ for (j = 0; j <= cur_point->tot_uw; j++) {
float cur_len, vec[2];
vec[0] = (*fp)[0] * scalex;
Modified: trunk/blender/source/blender/editors/space_time/space_time.c
===================================================================
--- trunk/blender/source/blender/editors/space_time/space_time.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/editors/space_time/space_time.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -562,6 +562,7 @@
ED_region_tag_redraw(ar);
break;
}
+ break;
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -1485,7 +1485,7 @@
z = staticSine[i];
px = 0.0f;
- for (j = 1; j < n - i + 1; j++) {
+ for (j = 1; j <= (n - i); j++) {
x = staticSine[j];
if (j == n - i) {
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -6780,7 +6780,7 @@
cpack(0xffffff);
set_inverted_drawing(1);
- for (i = 0; i < (selend - selstart + 1); i++) {
+ for (i = 0; i <= (selend - selstart); i++) {
SelBox *sb = &(cu->selboxes[i]);
if (i < (selend - selstart)) {
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2013-08-11 05:40:35 UTC (rev 59060)
@@ -826,6 +826,7 @@
if (rv3d->persp == RV3D_CAMOB) {
ED_region_tag_redraw(ar);
}
+ break;
}
}
break;
Modified: trunk/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp 2013-08-11 05:40:35 UTC (rev 59060)
@@ -478,7 +478,7 @@
void FitCurveWrapper::DrawBezierCurve(int n, Vector2 *curve)
{
- for (int i = 0; i < n + 1; ++i)
+ for (int i = 0; i <= n; ++i)
_vertices.push_back(curve[i]);
}
Modified: trunk/blender/source/blender/freestyle/intern/stroke/StrokeRep.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/stroke/StrokeRep.cpp 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/freestyle/intern/stroke/StrokeRep.cpp 2013-08-11 05:40:35 UTC (rev 59060)
@@ -414,10 +414,10 @@
cerr << "Stephane dit \"Toto\"" << endl;
//traverse all the vertices of the singularity and average them
Vec2r avP(0.0, 0.0);
- for (j = i - timeSinceSingu1; j < i + 1; j++)
+ for (j = i - timeSinceSingu1; j <= i; j++)
avP = Vec2r(avP + _vertices[2 * j]->point2d());
avP = Vec2r( 1.0 / float(timeSinceSingu1 + 1) * avP);
- for (j = i - timeSinceSingu1; j < i + 1; j++)
+ for (j = i - timeSinceSingu1; j <= i; j++)
_vertices[2 * j]->setPoint2d(avP);
//_vertex[2 * j] = _vertex[2 * i];
singu1 = false;
@@ -435,10 +435,10 @@
cerr << "Stephane dit \"Toto\"" << endl;
//traverse all the vertices of the singularity and average them
Vec2r avP(0.0, 0.0);
- for (j = i - timeSinceSingu2; j < i + 1; j++)
+ for (j = i - timeSinceSingu2; j <= i; j++)
avP = Vec2r(avP + _vertices[2 * j + 1]->point2d());
avP = Vec2r(1.0 / float(timeSinceSingu2 + 1) * avP);
- for (j = i - timeSinceSingu2; j < i + 1; j++)
+ for (j = i - timeSinceSingu2; j <= i; j++)
_vertices[2 * j + 1]->setPoint2d(avP);
//_vertex[2 * j + 1] = _vertex[2 * i + 1];
singu2 = false;
Modified: trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp 2013-08-11 05:40:35 UTC (rev 59060)
@@ -74,7 +74,7 @@
_directions = iBrother._directions;
_mapping = iBrother._mapping;
_imagesPyramids = new ImagePyramid *[_nbOrientations + 1]; // one more map to store the complete visible VM
- for (i = 0; i < _nbOrientations + 1; ++i)
+ for (i = 0; i <= _nbOrientations; ++i)
_imagesPyramids[i] = new GaussianPyramid(*(dynamic_cast<GaussianPyramid*>(iBrother._imagesPyramids[i])));
}
Modified: trunk/blender/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/view_map/ViewMapIO.cpp 2013-08-10 23:27:42 UTC (rev 59059)
+++ trunk/blender/source/blender/freestyle/intern/view_map/ViewMapIO.cpp 2013-08-11 05:40:35 UTC (rev 59060)
@@ -982,7 +982,7 @@
if (fe_s) {
bool b;
READ(b);
- for (READ(fe_rle1), fe_rle2 = 0; fe_rle1 < fe_s + 1; fe_rle2 = fe_rle1, READ(fe_rle1)) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list