Skip to content

Merge master in develop#5988

Merged
BenjaminDeleze merged 6 commits intodevelopfrom
merge-master-in-develop
Mar 14, 2023
Merged

Merge master in develop#5988
BenjaminDeleze merged 6 commits intodevelopfrom
merge-master-in-develop

Conversation

@BenjaminDeleze
Copy link
Copy Markdown

Conflict:

  • src/webots/nodes/WbCamera.cpp

stefaniapedrazzi and others added 6 commits March 13, 2023 13:54
* Remove unwanted altitude change

* Update changelog-r2023.md
* Fix scaled bounding sphere radius

* Fix assertion failure computing WbMathsUtilities::clampedAcos

* Adjust tests

* Fix inconsistencies with WbBoundingSphere radius scale

* Remove unused method

* Fix line too long

* Fixed shadows variables

* Fix computation of bounding sphere not updated to ENU
@BenjaminDeleze BenjaminDeleze added the synchronization Synchronization of branches label Mar 14, 2023
@BenjaminDeleze BenjaminDeleze requested a review from a team as a code owner March 14, 2023 07:19
Copy link
Copy Markdown
Member

@omichel omichel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@BenjaminDeleze BenjaminDeleze merged commit 9aa4651 into develop Mar 14, 2023
@BenjaminDeleze BenjaminDeleze deleted the merge-master-in-develop branch March 14, 2023 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

synchronization Synchronization of branches

Development

Successfully merging this pull request may close these issues.

3 participants