Skip to content

Commit

Permalink
merge from ign-rendering6
Browse files Browse the repository at this point in the history
Signed-off-by: Ian Chen <ichen@openrobotics.org>
  • Loading branch information
iche033 committed Apr 13, 2023
2 parents 4e2585c + 9421565 commit a9e2aba
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions ogre2/src/Ogre2Camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,11 @@ void Ogre2Camera::SetVisibilityMask(uint32_t _mask)
{
if (_mask & ~Ogre::VisibilityFlags::RESERVED_VISIBILITY_FLAGS)
{
gzerr << "Ogre2Camera::SetVisibilityMask: Mask bits " << std::hex
<< ~Ogre::VisibilityFlags::RESERVED_VISIBILITY_FLAGS << std::dec
<< " are set but will be ignored by ogre2 backend." << std::endl;
gzwarn << "Ogre2Camera::SetVisibilityMask: Mask bits " << std::hex
<< ~Ogre::VisibilityFlags::RESERVED_VISIBILITY_FLAGS << std::dec
<< " are set but will be ignored as they conflict with the "
<< "reserved bits used internally by the ogre2 backend."
<< std::endl;
}
BaseSensor::SetVisibilityMask(_mask);
if (this->renderTexture)
Expand Down
2 changes: 1 addition & 1 deletion src/RenderPassSystem.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RenderPassPtr RenderPassSystem::CreateImpl(const std::string &_type)
}
else
{
gzerr << "RenderPass of typeid '" << _type << "' is not registered"
gzwarn << "RenderPass of typeid '" << _type << "' is not registered"
<< std::endl;
}
return pass;
Expand Down

0 comments on commit a9e2aba

Please sign in to comment.