FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.8 branch: Merge 11959 from trunk. Makes Object::setName() virtual, which fixes an issue with the uniform name ID mechanism.

Browse Source
This commit is contained in:
Paul MARTZ
2011-06-04 00:07:59 +00:00
parent 0aab63cfba
commit 9e8c1b033e
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/Object
View File

@@ -96,10 +96,14 @@ class OSG_EXPORT Object : public Referenced
/** Set the name of object using C++ style string.*/
inline void setName( const std::string& name ) { _name = name; }
virtual void setName( const std::string& name ) { _name = name; }
/** Set the name of object using a C style string.*/
inline void setName( const char* name ) { _name = name; }
inline void setName( const char* name )
{
if (name) setName(std::string(name));
else setName(std::string());
}
/** Get the name of object.*/
inline const std::string& getName() const { return _name; }