diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-25 13:33:46 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-25 13:33:46 +0400 |
| commit | 5eecb2ab48547449cfd9d668b92cb257bbd8da86 (patch) | |
| tree | 62600c1a0cf6c64266e324264c5d25dc80e5b188 /intern/itasc/CopyPose.cpp | |
| parent | 7c9bb3c40aecbb6e8e8045637c501433eed251f0 (diff) | |
Warning fixes for ITASC. Also, use <stdlib.h> instead of <malloc.h>,
it works everywhere.
Diffstat (limited to 'intern/itasc/CopyPose.cpp')
| -rw-r--r-- | intern/itasc/CopyPose.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/itasc/CopyPose.cpp b/intern/itasc/CopyPose.cpp index 7977089d280..69722909ed1 100644 --- a/intern/itasc/CopyPose.cpp +++ b/intern/itasc/CopyPose.cpp @@ -21,7 +21,7 @@ CopyPose::CopyPose(unsigned int control_output, unsigned int dynamic_output, dou { m_maxerror = armlength/2.0; m_outputControl = (control_output & CTL_ALL); - int _nc = nBitsOn(m_outputControl); + unsigned int _nc = nBitsOn(m_outputControl); if (!_nc) return; // reset the constraint set @@ -284,7 +284,7 @@ void CopyPose::updateJacobian() void CopyPose::updateState(ConstraintValues* _values, ControlState* _state, unsigned int mask, double timestep) { - int id = (mask == CTL_ROTATIONX) ? ID_ROTATIONX : ID_POSITIONX; + unsigned int id = (mask == CTL_ROTATIONX) ? ID_ROTATIONX : ID_POSITIONX; ControlState::ControlValue* _yval; ConstraintSingleValue* _data; int i, j, k; |