code cleanup: unused vars, make other vars static.

16 files changed, 23 insertions, 37 deletions

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);
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 52ad95c71b6..c025d439fc0 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -1207,8 +1207,8 @@ void PyObjectPlus::ClearDeprecationWarning()
 	NullDeprecationWarning();
 }
 
-WarnLink*		m_base_wlink_first= NULL;
-WarnLink*		m_base_wlink_last= NULL;
+static WarnLink *m_base_wlink_first = NULL;
+static WarnLink *m_base_wlink_last = NULL;
 
 WarnLink*		PyObjectPlus::GetDeprecationWarningLinkFirst(void) {return m_base_wlink_first;}
 WarnLink*		PyObjectPlus::GetDeprecationWarningLinkLast(void) {return m_base_wlink_last;}
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index 30a56c9165a..383e83dcd89 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -135,14 +135,14 @@ effect: deletes the object
 }
 
 
-
-
+/* UNUSED */
+#if 0
 #define VALUE_SUB(val1, val2) (val1)->Calc(VALUE_SUB_OPERATOR, val2)
 #define VALUE_MUL(val1, val2) (val1)->Calc(VALUE_MUL_OPERATOR, val2)
 #define VALUE_DIV(val1, val2) (val1)->Calc(VALUE_DIV_OPERATOR, val2)
 #define VALUE_NEG(val1)       (val1)->Calc(VALUE_NEG_OPERATOR, val1)
 #define VALUE_POS(val1)       (val1)->Calc(VALUE_POS_OPERATOR, val1)
-
+#endif
 
 STR_String CValue::op2str(VALUE_OPERATOR op)
 {
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index fa40dad21e7..3baa72eb3c8 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -265,7 +265,7 @@ if(WITH_BULLET)
 	list(APPEND INC
 		../Physics/Bullet
 	)
-	list(APPEND INC
+	list(APPEND INC_SYS
 		${BULLET_INCLUDE_DIRS}
 	)
 	add_definitions(-DWITH_BULLET)
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp
index fb3e6c58027..f652158d72c 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.cpp
+++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp
@@ -330,7 +330,7 @@ static PyObject *KX_PythonSeq_get(PyObject *self, PyObject *args)
 	return def;
 }
 
-PySequenceMethods KX_PythonSeq_as_sequence = {
+static PySequenceMethods KX_PythonSeq_as_sequence = {
 	NULL,		/* Cant set the len otherwise it can evaluate as false */
 	NULL,		/* sq_concat */
 	NULL,		/* sq_repeat */
@@ -349,7 +349,7 @@ static PyMappingMethods KX_PythonSeq_as_mapping = {
 	0,	/* mp_ass_subscript */
 };
 
-PyMethodDef KX_PythonSeq_methods[] = {
+static PyMethodDef KX_PythonSeq_methods[] = {
 	// dict style access for props
 	{"get",(PyCFunction) KX_PythonSeq_get, METH_VARARGS},
 	{NULL,NULL} //Sentinel
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp
index ab73ba1902a..cd1c9eed91b 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.cpp
+++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp
@@ -489,7 +489,7 @@ KX_VertexProxy::~KX_VertexProxy()
 // stuff for cvalue related things
 CValue*		KX_VertexProxy::Calc(VALUE_OPERATOR, CValue *) { return NULL;}
 CValue*		KX_VertexProxy::CalcFinal(VALUE_DATA_TYPE, VALUE_OPERATOR, CValue *) { return NULL;}
-STR_String	sVertexName="vertex";
+static STR_String sVertexName = "vertex";
 const STR_String &	KX_VertexProxy::GetText() {return sVertexName;};
 double		KX_VertexProxy::GetNumber() { return -1;}
 STR_String&	KX_VertexProxy::GetName() { return sVertexName;}
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index c5b601361d9..89d7f41ab4d 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -59,7 +59,7 @@ set(SRC
 )
 
 if(WITH_BULLET)
-	list(APPEND INC
+	list(APPEND INC_SYS
 		${BULLET_INCLUDE_DIRS}
 	)
 	add_definitions(-DWITH_BULLET)
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 08ea9706eba..111cfdb2c44 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -64,8 +64,6 @@ float gLinearSleepingTreshold;
 float gAngularSleepingTreshold;
 
 
-btVector3 startVel(0,0,0);//-10000);
-
 BlenderBulletCharacterController::BlenderBulletCharacterController(btMotionState *motionState, btPairCachingGhostObject *ghost, btConvexShape* shape, float stepHeight)
 	: btKinematicCharacterController(ghost,shape,stepHeight,2),
 		m_motionState(motionState),
@@ -144,14 +142,6 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci)
 	m_characterController = 0;
 	
 	CreateRigidbody();
-	
-
-///???
-/*#ifdef WIN32
-	if (GetRigidBody() && !GetRigidBody()->isStaticObject())
-		GetRigidBody()->setLinearVelocity(startVel);
-#endif*/
-
 }
 
 btTransform&	CcdPhysicsController::GetTransformFromMotionState(PHY_IMotionState* motionState)
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index 29b526067fd..e92f7bd1268 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -45,14 +45,12 @@ subject to the following restrictions:
 
 #define CCD_CONSTRAINT_DISABLE_LINKED_COLLISION 0x80
 
-bool useIslands = true;
-
 #ifdef NEW_BULLET_VEHICLE_SUPPORT
 #include "BulletDynamics/Vehicle/btRaycastVehicle.h"
 #include "BulletDynamics/Vehicle/btVehicleRaycaster.h"
 #include "BulletDynamics/Vehicle/btWheelInfo.h"
 #include "PHY_IVehicle.h"
-btRaycastVehicle::btVehicleTuning	gTuning;
+static btRaycastVehicle::btVehicleTuning	gTuning;
 
 #endif //NEW_BULLET_VEHICLE_SUPPORT
 #include "LinearMath/btAabbUtil2.h"
@@ -2352,11 +2350,6 @@ PHY_ICharacter* CcdPhysicsEnvironment::getCharacterController(KX_GameObject *ob)
 	return NULL;
 }
 
-int currentController = 0;
-int numController = 0;
-
-
-
 
 PHY_IPhysicsController*	CcdPhysicsEnvironment::CreateSphereController(float radius,const MT_Vector3& position)
 {
diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp
index 18095ea631d..28fff8b9a6c 100644
--- a/source/gameengine/VideoTexture/ImageViewport.cpp
+++ b/source/gameengine/VideoTexture/ImageViewport.cpp
@@ -38,6 +38,7 @@
 #include "KX_PythonInit.h"
 #include "Texture.h"
 #include "ImageBase.h"
+#include "VideoBase.h"
 #include "FilterSource.h"
 #include "ImageViewport.h"