diff options
| -rw-r--r-- | intern/itasc/Scene.cpp | 4 | ||||
| -rw-r--r-- | source/blender/ikplugin/intern/itasc_plugin.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PyConstraintBinding.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 8 |
4 files changed, 7 insertions, 8 deletions
diff --git a/intern/itasc/Scene.cpp b/intern/itasc/Scene.cpp index d46e4da7900..0c5e00ec56f 100644 --- a/intern/itasc/Scene.cpp +++ b/intern/itasc/Scene.cpp @@ -292,7 +292,7 @@ bool Scene::update(double timestamp, double timestep, unsigned int numsubstep, b return true; } - double maxqdot; + // double maxqdot; // UNUSED e_scalar nlcoef; SceneLock lockCallback(this); Frame external_pose; @@ -454,7 +454,7 @@ bool Scene::update(double timestamp, double timestep, unsigned int numsubstep, b // We will pass the joint velocity to each object and they will recommend a maximum timestep timesubstep = timeleft; // get armature max joint velocity to estimate the maximum duration of integration - maxqdot = m_qdot.cwise().abs().maxCoeff(); + // maxqdot = m_qdot.cwise().abs().maxCoeff(); // UNUSED double maxsubstep = nlcoef*m_maxstep; if (maxsubstep < m_minstep) maxsubstep = m_minstep; diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index dbd7c7dbf14..a456e18498b 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -860,13 +860,11 @@ static int convert_channels(IK_Scene *ikscene, PoseTree *tree) { IK_Channel *ikchan; bPoseChannel *pchan; - Bone *bone; int a, flag, njoint; njoint = 0; for(a=0, ikchan = ikscene->channels; a<ikscene->numchan; ++a, ++ikchan) { pchan= tree->pchan[a]; - bone= pchan->bone; ikchan->pchan = pchan; ikchan->parent = (a>0) ? tree->parent[a] : -1; ikchan->owner = ikscene->blArmature; diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp index 8776bf6fe88..bf288e1f1ad 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp @@ -405,6 +405,7 @@ static PyObject* gPyCreateConstraint(PyObject* self, PyObject* args, PyObject* kwds) { + /* FIXME - physicsid is an int being cast to a pointer, should at least use PyCapsule */ int physicsid=0,physicsid2 = 0,constrainttype=0,extrainfo=0; int len = PyTuple_Size(args); int success = 1; diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 0be0fa3c7dc..4226399f192 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -1919,10 +1919,10 @@ static void restorePySysObjects(void) // Copied from bpy_interface.c static struct _inittab bge_internal_modules[]= { - {"mathutils", BPyInit_mathutils}, - {"bgl", BPyInit_bgl}, - {"blf", BPyInit_blf}, - {"aud", AUD_initPython}, + {(char *)"mathutils", BPyInit_mathutils}, + {(char *)"bgl", BPyInit_bgl}, + {(char *)"blf", BPyInit_blf}, + {(char *)"aud", AUD_initPython}, {NULL, NULL} }; |