[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55943] trunk/blender: code cleanup: unused vars, make other vars static.
Campbell Barton
ideasman42 at gmail.com
Thu Apr 11 00:49:51 CEST 2013
Revision: 55943
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55943
Author: campbellbarton
Date: 2013-04-10 22:49:50 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
code cleanup: unused vars, make other vars static.
Modified Paths:
--------------
trunk/blender/intern/audaspace/intern/AUD_JOSResampleReader.cpp
trunk/blender/source/blender/freestyle/intern/geometry/Noise.h
trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h
trunk/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
trunk/blender/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
trunk/blender/source/blender/freestyle/intern/stroke/Curve.cpp
trunk/blender/source/blender/freestyle/intern/stroke/Stroke.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
trunk/blender/source/gameengine/Expressions/Value.cpp
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
Modified: trunk/blender/intern/audaspace/intern/AUD_JOSResampleReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_JOSResampleReader.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/intern/audaspace/intern/AUD_JOSResampleReader.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -57,7 +57,8 @@
#endif
#endif
-#define CC m_channels + channel
+// UNUSED
+// #define CC m_channels + channel
#define AUD_RATE_MAX 256
#define SHIFT_BITS 12
Modified: trunk/blender/source/blender/freestyle/intern/geometry/Noise.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Noise.h 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Noise.h 2013-04-10 22:49:50 UTC (rev 55943)
@@ -73,7 +73,8 @@
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 */
Modified: trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h 2013-04-10 22:49:50 UTC (rev 55943)
@@ -117,7 +117,8 @@
}
private:
- real center_[3];
+ /* UNUSED */
+ // real center_[3];
Vec3r axis_[3];
real eigen_value_[3];
real M_[6];
Modified: trunk/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -49,8 +49,6 @@
_clamp = clamp;
}
-float ksinToto = 0.0f;
-
int CalligraphicShader::shade(Stroke &ioStroke) const
{
Interface0DIterator v;
Modified: trunk/blender/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h 2013-04-10 22:49:50 UTC (rev 55943)
@@ -447,7 +447,8 @@
class LIB_STROKE_EXPORT CalligraphicColorShader : public StrokeShader
{
private:
- int _textureId;
+ /* UNUSED */
+ // int _textureId;
Vec2d _orientation;
public:
Modified: trunk/blender/source/blender/freestyle/intern/stroke/Curve.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/stroke/Curve.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/blender/freestyle/intern/stroke/Curve.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -815,7 +815,8 @@
}
#endif
-#define EPS_CURVA_DIR 0.01
+/* UNUSED */
+// #define EPS_CURVA_DIR 0.01
void Curve::computeCurvatureAndOrientation ()
{
Modified: trunk/blender/source/blender/freestyle/intern/stroke/Stroke.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/stroke/Stroke.h 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/blender/freestyle/intern/stroke/Stroke.h 2013-04-10 22:49:50 UTC (rev 55943)
@@ -520,7 +520,7 @@
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;
Modified: trunk/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -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 @@
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);
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -1207,8 +1207,8 @@
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;}
Modified: trunk/blender/source/gameengine/Expressions/Value.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/gameengine/Expressions/Value.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -135,15 +135,15 @@
}
-
-
+/* 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)
{
//pre:
Modified: trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2013-04-10 22:49:50 UTC (rev 55943)
@@ -265,7 +265,7 @@
list(APPEND INC
../Physics/Bullet
)
- list(APPEND INC
+ list(APPEND INC_SYS
${BULLET_INCLUDE_DIRS}
)
add_definitions(-DWITH_BULLET)
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -330,7 +330,7 @@
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 @@
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
Modified: trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -489,7 +489,7 @@
// 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;}
Modified: trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt 2013-04-10 22:49:50 UTC (rev 55943)
@@ -59,7 +59,7 @@
)
if(WITH_BULLET)
- list(APPEND INC
+ list(APPEND INC_SYS
${BULLET_INCLUDE_DIRS}
)
add_definitions(-DWITH_BULLET)
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -64,8 +64,6 @@
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 @@
m_characterController = 0;
CreateRigidbody();
-
-
-///???
-/*#ifdef WIN32
- if (GetRigidBody() && !GetRigidBody()->isStaticObject())
- GetRigidBody()->setLinearVelocity(startVel);
-#endif*/
-
}
btTransform& CcdPhysicsController::GetTransformFromMotionState(PHY_IMotionState* motionState)
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2013-04-10 22:20:24 UTC (rev 55942)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2013-04-10 22:49:50 UTC (rev 55943)
@@ -45,14 +45,12 @@
#define CCD_CONSTRAINT_DISABLE_LINKED_COLLISION 0x80
-bool useIslands = true;
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list