From 41c2a66d55d5fac8574e2c1b1e7ae1615e42f5d5 Mon Sep 17 00:00:00 2001
From: Maarten de Vries <maarten@de-vri.es>
Date: Fri, 3 Jun 2016 10:37:42 +0200
Subject: [PATCH] Swap out deprecated Ogre::MovableObject::setUserAny.

---
 src/rviz/ogre_helpers/grid.cpp  | 2 +-
 src/rviz/ogre_helpers/line.cpp  | 2 +-
 src/rviz/ogre_helpers/shape.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rviz/ogre_helpers/grid.cpp b/src/rviz/ogre_helpers/grid.cpp
index 885fe3f50d..a052484ccc 100644
--- a/src/rviz/ogre_helpers/grid.cpp
+++ b/src/rviz/ogre_helpers/grid.cpp
@@ -240,7 +240,7 @@ void Grid::create()
 
 void Grid::setUserData( const Ogre::Any& data )
 {
-  manual_object_->setUserAny( data );
+  manual_object_->getUserObjectBindings().setUserAny( data );
 }
 
 } // namespace rviz
diff --git a/src/rviz/ogre_helpers/line.cpp b/src/rviz/ogre_helpers/line.cpp
index ba913c8986..bd213cd095 100644
--- a/src/rviz/ogre_helpers/line.cpp
+++ b/src/rviz/ogre_helpers/line.cpp
@@ -145,7 +145,7 @@ const Ogre::Quaternion& Line::getOrientation()
 
 void Line::setUserData( const Ogre::Any& data )
 {
-  manual_object_->setUserAny( data );
+  manual_object_->getUserObjectBindings().setUserAny( data );
 }
 
 
diff --git a/src/rviz/ogre_helpers/shape.cpp b/src/rviz/ogre_helpers/shape.cpp
index dd7305623b..9ea68465b8 100644
--- a/src/rviz/ogre_helpers/shape.cpp
+++ b/src/rviz/ogre_helpers/shape.cpp
@@ -177,7 +177,7 @@ const Ogre::Quaternion& Shape::getOrientation()
 void Shape::setUserData( const Ogre::Any& data )
 {
   if (entity_)
-    entity_->setUserAny( data );
+    entity_->getUserObjectBindings().setUserAny( data );
   else
     ROS_ERROR("Shape not yet fully constructed. Cannot set user data. Did you add triangles to the mesh already?");
 }