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

3 -> 4 #474

Merged
merged 5 commits into from
Oct 19, 2021
Merged

3 -> 4 #474

merged 5 commits into from
Oct 19, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Oct 18, 2021

➡️ Forward port

Port ign-rendering3 to ign-rendering4

Branch comparison: ign-rendering4...ign-rendering3

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

traversaro and others added 5 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 🔮 dome Ignition Dome label Oct 18, 2021
@codecov
Copy link

codecov bot commented Oct 18, 2021

Codecov Report

Merging #474 (dc7f548) into ign-rendering4 (5e183b5) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head dc7f548 differs from pull request most recent head 09d3c16. Consider uploading reports for the commit 09d3c16 to get more accurate results
Impacted file tree graph

@@                Coverage Diff                 @@
##           ign-rendering4     #474      +/-   ##
==================================================
- Coverage           55.95%   55.95%   -0.01%     
==================================================
  Files                 147      147              
  Lines               14120    14119       -1     
==================================================
- Hits                 7901     7900       -1     
  Misses               6219     6219              
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 35.45% <ø> (ø)
ogre/src/OgreMaterialSwitcher.cc 0.00% <ø> (ø)
ogre/src/OgreRTShaderSystem.cc 42.00% <ø> (ø)
ogre/src/OgreScene.cc 26.47% <ø> (ø)
ogre/src/OgreText.cc 0.00% <ø> (ø)
ogre/src/OgreThermalCamera.cc 0.00% <ø> (ø)
ogre/src/OgreRenderEngine.cc 68.37% <100.00%> (-0.10%) ⬇️

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 5e183b5...09d3c16. Read the comment docs.

@iche033 iche033 merged commit 478e755 into ign-rendering4 Oct 19, 2021
@iche033 iche033 deleted the merge_3_4_20211018 branch October 19, 2021 00:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔮 dome Ignition Dome
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants