Merge branch 'master' of https://github.com/introlab/rtabmap into 0.11.0

This commit is contained in:
matlabbe
2015-12-11 17:44:36 -05:00
3 changed files with 36 additions and 35 deletions
+2 -2
View File
@@ -125,13 +125,13 @@ void Odometry::reset(const Transform & initialPose)
if(_force2D)
{
if(z != 0.0f || roll != 0.0f || yaw != 0.0f)
if(z != 0.0f || roll != 0.0f || pitch != 0.0f)
{
UWARN("Force2D=true and the initial pose contains z, roll or pitch values (%s). They are set to null.", initialPose.prettyPrint().c_str());
}
z = 0;
roll = 0;
yaw = 0;
pitch = 0;
Transform pose(x, y, z, roll, pitch, yaw);
_pose = pose;
}