Swap out deprecated Ogre::MovableObject::setUserAny.

ros-visualization · Jun 3, 2016 · 41c2a66 · 41c2a66
1 parent d28b37c
commit 41c2a66
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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?");
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 );
     }
@@ Expand Down @@