diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-18 06:13:36 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-18 06:13:36 +0400 |
| commit | 68715c5ca7c148f511ac1a8136e7590602895947 (patch) | |
| tree | ddaf2b0eb4035e799bbc2e43ec5f1f13309e8387 /source/blender/freestyle/intern/stroke | |
| parent | 94ae0232b0337ab70cecaef03cd845887cd36eaa (diff) | |
A patch set from Bastien Montagne (thanks!) for silencing build warnings (from gcc 4.7),
mostly by commenting out unused variables, or using the BLI's SET_UINT_IN_POINTER macro.
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp index f757f6ced82..2df4d19195e 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp @@ -124,7 +124,7 @@ int GetDirectionalViewMapDensityF1D::operator()(Interface1D& inter) int GetCompleteViewMapDensityF1D::operator()(Interface1D& inter) { //soc unsigned size; - Id id = inter.getId(); + /* Id id = inter.getId(); */ /* UNUSED */ result = integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration); return 0; } diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index 245f4cfb3de..fd070a59699 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -226,10 +226,10 @@ ThicknessVariationPatternShader::ThicknessVariationPatternShader(const string pa int ThicknessVariationPatternShader::shade(Stroke& stroke) const { StrokeInternal::StrokeVertexIterator v, vend; - float *array = 0; - int size; + float *array = NULL; + /* int size; */ /* UNUSED */ array = _aThickness; - size = _size; + /* size = _size; */ /* UNUSED */ int vert_size = stroke.strokeVerticesSize(); int sig = 0; unsigned index; diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index e69b4dab712..bc117925a4c 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp @@ -292,10 +292,10 @@ void Strip::createStrip (const vector<StrokeVertex*>& iStrokeVertices) _vertices.push_back(new StrokeVertexRep(sv->getPoint() + thicknessLast[1] * stripDirLast)); ++i; _vertices.push_back(new StrokeVertexRep(sv->getPoint() - thicknessLast[0] * stripDirLast)); - int n = i; ++i; #if 0 + int n = i - 1; // check whether the orientation of the extremity was user defined userDir = _stroke->getEndingOrientation(); if (userDir != Vec2r(0, 0)) { |