Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 1 #1844

Merged
merged 2 commits into from
Dec 11, 2024
Merged

Patch 1 #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd6571
Update mesh_loader.cpp
akazxd Dec 11, 2024
e1bd662
Update robot_link.cpp
akazxd Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rviz/mesh_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ void loadTexture(const std::string& resource_path)
{
Ogre::DataStreamPtr stream(new Ogre::MemoryDataStream(res.data.get(), res.size));
Ogre::Image image;
std::string extension = fs::extension(fs::path(resource_path));
std::string extension = fs::path(resource_path).extension().string();

if (extension[0] == '.')
{
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/robot/robot_link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ Ogre::MaterialPtr RobotLink::getMaterialForLink(const urdf::LinkConstSharedPtr&
{
Ogre::DataStreamPtr stream(new Ogre::MemoryDataStream(res.data.get(), res.size));
Ogre::Image image;
std::string extension = fs::extension(fs::path(filename));
std::string extension = fs::path(filename).extension().string();

if (extension[0] == '.')
{
Expand Down
Loading