From 8c1cb10cfd5e6f5edcb23a8a28db2287ed463eb4 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 10 Apr 2013 22:49:50 +0000
Subject: code cleanup: unused vars, make other vars static.

---
 source/blender/freestyle/intern/geometry/Noise.h                 | 3 ++-
 source/blender/freestyle/intern/geometry/normal_cycle.h          | 3 ++-
 source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp | 2 --
 source/blender/freestyle/intern/stroke/BasicStrokeShaders.h      | 3 ++-
 source/blender/freestyle/intern/stroke/Curve.cpp                 | 3 ++-
 source/blender/freestyle/intern/stroke/Stroke.h                  | 2 +-
 source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp      | 4 ++--
 7 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/freestyle/intern/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h
index f0135e07321..bed46ab1b01 100644
--- a/source/blender/freestyle/intern/geometry/Noise.h
+++ b/source/blender/freestyle/intern/geometry/Noise.h
@@ -73,7 +73,8 @@ private:
 	float g3[_NOISE_B + _NOISE_B + 2][3];
 	float g2[_NOISE_B + _NOISE_B + 2][2];
 	float g1[_NOISE_B + _NOISE_B + 2];
-	int start;
+	/* UNUSED */
+	// int start;
 };
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h
index 66439e04058..86e3ed0f2f5 100644
--- a/source/blender/freestyle/intern/geometry/normal_cycle.h
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.h
@@ -117,7 +117,8 @@ public:
 	}
 
 private:
-	real center_[3];
+	/* UNUSED */
+	// real center_[3];
 	Vec3r axis_[3];
 	real eigen_value_[3];
 	real M_[6];
diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
index 00d0171f80b..1279d1824fb 100644
--- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
@@ -49,8 +49,6 @@ CalligraphicShader::CalligraphicShader(real iMinThickness, real iMaxThickness, c
 	_clamp = clamp;
 }
 
-float ksinToto = 0.0f;
-
 int CalligraphicShader::shade(Stroke &ioStroke) const
 {
 	Interface0DIterator v;
diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
index 10c7563b82c..d55a689def4 100644
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
@@ -447,7 +447,8 @@ public:
 class LIB_STROKE_EXPORT CalligraphicColorShader : public StrokeShader
 {
 private:
-	int _textureId;
+	/* UNUSED */
+	//  int _textureId;
 	Vec2d _orientation;
 
 public:
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index b7bbe533a19..af9c8c2869d 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -815,7 +815,8 @@ real Curve::local_average_density(float sigma, int iCombination ) const
 }
 #endif
 
-#define EPS_CURVA_DIR 0.01
+/* UNUSED */
+// #define EPS_CURVA_DIR 0.01
 
 void Curve::computeCurvatureAndOrientation ()
 {
diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index a8291eb783d..ee2e1ccba04 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -520,7 +520,7 @@ private:
 	float _Length; // The stroke length
 	viewedge_container _ViewEdges;
 	float _sampling;
-	StrokeRenderer *_renderer; // mark implementation OpenGL renderer
+	// StrokeRenderer *_renderer; // mark implementation OpenGL renderer
 	MediumType _mediumType;
 	unsigned int _textureId;
 	bool _tips;
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 914a06eb27f..bbbf997b463 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -48,7 +48,7 @@
 namespace Freestyle {
 
 // XXX Grmll... G is used as template's typename parameter :/
-const Global &_global = G;
+static const Global &_global = G;
 
 #define LOGGING FALSE
 
@@ -2307,7 +2307,7 @@ void ViewMapBuilder::ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsi
 			        fB->vertexB()->getId() << endl;
 
 #if 0
-		if (G.debug & G_DEBUG_FREESTYLE) {
+		if (_global.debug & G_DEBUG_FREESTYLE) {
 			if ((Ta < -epsilon) || (Ta > 1 + epsilon) || (Tb < -epsilon) || (Tb > 1 + epsilon)) {
 				printf("ta %.12e\n", ta);
 				printf("tb %.12e\n", tb);
-- 
cgit v1.2.3