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.

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

4 -> 5 #475

Merged
merged 8 commits into from
Oct 19, 2021
Merged

4 -> 5 #475

merged 8 commits into from
Oct 19, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Oct 19, 2021

➡️ Forward port

Port ign-rendering4 to ign-rendering5

Branch comparison: ign-rendering5...ign-rendering4

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

traversaro and others added 7 commits October 6, 2021 23:20
Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
* Avoid symbol redefiniition on armel builds

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
* Fix logic on warning for ogre versions different than 1.9.x

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Oct 19, 2021
@codecov
Copy link

codecov bot commented Oct 19, 2021

Codecov Report

Merging #475 (ba5e7f1) into ign-rendering5 (1d0d22a) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           ign-rendering5     #475      +/-   ##
==================================================
- Coverage           57.80%   57.79%   -0.01%     
==================================================
  Files                 161      161              
  Lines               16086    16085       -1     
==================================================
- Hits                 9298     9297       -1     
  Misses               6788     6788              
Impacted Files Coverage Δ
include/ignition/rendering/Storage.hh 25.00% <ø> (ø)
ogre/src/OgreGaussianNoisePass.cc 1.81% <ø> (ø)
ogre/src/OgreGpuRays.cc 0.00% <ø> (ø)
ogre/src/OgreMaterial.cc 36.06% <ø> (ø)
ogre/src/OgreMaterialSwitcher.cc 0.00% <ø> (ø)
ogre/src/OgreRTShaderSystem.cc 43.12% <ø> (ø)
ogre/src/OgreScene.cc 28.07% <ø> (ø)
ogre/src/OgreText.cc 0.00% <ø> (ø)
ogre/src/OgreThermalCamera.cc 0.00% <ø> (ø)
ogre2/src/Ogre2RenderEngine.cc 78.57% <ø> (ø)
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0973b0b...ba5e7f1. Read the comment docs.

@iche033 iche033 merged commit c1b0a41 into ign-rendering5 Oct 19, 2021
@iche033 iche033 deleted the merge_4_5_20211018 branch October 19, 2021 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants