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

Merge master into develop #6750

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Merge master into develop #6750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58242dd
Fix Crash When Loading an Invalid Background HDR Image (#6744)
CoolSpy3 Dec 24, 2024
65094da
Fix Heron Warnings (Port #6717) (#6742)
CoolSpy3 Dec 27, 2024
f057d2f
Merge branch 'develop' of https://github.com/cyberbotics/webots into …
CoolSpy3 Jan 6, 2025
a83a79f
Merge branch 'develop' into sync-master-65094da8c
lukicdarkoo Jan 16, 2025
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
1 change: 1 addition & 0 deletions docs/reference/changelog-r2025.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@ Released on December **th, 2023.
- Fixed a bug where Webots would crash if a geometry was inserted into a `Shape` node used a bounding box ([#6691](https://github.com/cyberbotics/webots/pull/6691)).
- Removed the old `wb_supervisor_field_import_sf_node` and `wb_supervisor_field_import_mf_node` functions from the list of editor autocomplete suggestions ([#6701](https://github.com/cyberbotics/webots/pull/6701)).
- Fixed a bug preventing nodes from being inserted into unconnected proto fields ([#6735](https://github.com/cyberbotics/webots/pull/6735)).
- Fixed crash when an invalid HDR image was set as a world background ([#6744](https://github.com/cyberbotics/webots/pull/6744)).
- Fixed handling of remote assets from unofficial sources ([#6585](https://github.com/cyberbotics/webots/pull/6585)).
- Fixed the QtToolTip bug, where the text in the text box is not being displayed ([#6711](https://github.com/cyberbotics/webots/pull/6711)).
8 changes: 2 additions & 6 deletions projects/robots/clearpath/heron/worlds/ocean.wbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackground.proto"
EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
EXTERNPROTO "webots://projects/objects/obstacles/protos/OilBarrel.proto"
EXTERNPROTO "../protos/Heron.proto"
EXTERNPROTO "webots://projects/robots/clearpath/heron/protos/Heron.proto"

WorldInfo {
}
Expand All @@ -30,11 +30,7 @@ DEF WATER Fluid {
}
]
viscosity 0.01
boundingObject Transform {
children [
USE WATER_BOX
]
}
boundingObject USE WATER_BOX
locked TRUE
}
Heron {
Expand Down
8 changes: 2 additions & 6 deletions projects/robots/clearpath/heron/worlds/swarm.wbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackground.proto"
EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
EXTERNPROTO "webots://projects/objects/obstacles/protos/OilBarrel.proto"
EXTERNPROTO "../protos/Heron.proto"
EXTERNPROTO "webots://projects/robots/clearpath/heron/protos/Heron.proto"

WorldInfo {
}
Expand All @@ -30,11 +30,7 @@ DEF WATER Fluid {
}
]
viscosity 0.01
boundingObject Transform {
children [
USE WATER_BOX
]
}
boundingObject USE WATER_BOX
locked TRUE
}
OilBarrel {
Expand Down
5 changes: 5 additions & 0 deletions src/webots/nodes/WbBackground.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,11 @@ bool WbBackground::loadIrradianceTexture(int i) {
float *data = stbi_loadf_from_memory(reinterpret_cast<const unsigned char *>(content.constData()), content.size(),
&mIrradianceWidth, &mIrradianceHeight, &components, 0);

if (data == NULL) {
warn(tr("Failed to load HDR texture '%1': %2.").arg(url).arg(stbi_failure_reason()));
return false;
}

const int rotate = gCoordinateSystemRotate(i);
// FIXME: this texture rotation should be performed by OpenGL or in the shader to get a better performance
if (rotate != 0) {
Expand Down
Loading