Skip to content

Commit ac476aa

Browse files
authored
Merge pull request #696 from azeey/6_to_main
Merge gz-common6 ➡️ main
2 parents ced905f + 4249003 commit ac476aa

File tree

2 files changed

+50
-0
lines changed

2 files changed

+50
-0
lines changed

Changelog.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,55 @@
184184

185185
## Gazebo Common 5.x
186186

187+
### Gazebo Common 5.7.1 (2025-01-30)
188+
189+
1. Add include <chrono> for system_clock in Event.hh
190+
* [Pull request #655](https://github.com/gazebosim/gz-common/pull/655)
191+
192+
1. Check normal presence before trying to read asMesh normals
193+
* [Pull request #654](https://github.com/gazebosim/gz-common/pull/654)
194+
195+
1. Remove Conda Windows warnings
196+
* [Pull request #652](https://github.com/gazebosim/gz-common/pull/652)
197+
198+
## Gazebo Common 5.7.0 (2024-11-08)
199+
200+
1. Fix loading lightmaps from gltf / glb meshes (#630)
201+
* [Pull request #630) (#646](https://github.com/gazebosim/gz-common/pull/630) (#646)
202+
203+
1. Fix AssimpLoader collada texture coordinates
204+
* [Pull request #634](https://github.com/gazebosim/gz-common/pull/634)
205+
206+
1. Remove debug logging introduced accidentally in PR review
207+
* [Pull request #622](https://github.com/gazebosim/gz-common/pull/622)
208+
209+
1. Fix crash when calling absPath with empty input
210+
* [Pull request #620](https://github.com/gazebosim/gz-common/pull/620)
211+
212+
1. DEM: Add support for GDAL vsicurl, vsizip support and avoid segfaults with huge VRT datasets
213+
* [Pull request #597](https://github.com/gazebosim/gz-common/pull/597)
214+
215+
1. SubMesh::RecalculateNormals improvement
216+
* [Pull request #609](https://github.com/gazebosim/gz-common/pull/609)
217+
218+
1. fix data race tsan issue
219+
* [Pull request #612](https://github.com/gazebosim/gz-common/pull/612)
220+
221+
1. Generate a more unique texture name for glb embedded textures
222+
* [Pull request #606](https://github.com/gazebosim/gz-common/pull/606)
223+
224+
1. Add package.xml
225+
* [Pull request #587](https://github.com/gazebosim/gz-common/pull/587)
226+
227+
1. Fix deprecation warnings
228+
* [Pull request #603](https://github.com/gazebosim/gz-common/pull/603)
229+
230+
1. Fix macOS workflow and update on-push branches
231+
* [Pull request #602](https://github.com/gazebosim/gz-common/pull/602)
232+
233+
1. Fix compatibility with FFmpeg5.0
234+
* [Pull request #581](https://github.com/gazebosim/gz-common/pull/581)
235+
187236
## Gazebo Common 5.6.0 (2024-04-23)
188237

189238
1. Clarify units for the DEM classes

graphics/src/AssimpLoader.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include <assimp/Importer.hpp> // C++ importer interface
4141
#include <assimp/postprocess.h> // Post processing flags
4242
#include <assimp/scene.h> // Output data structure
43+
#include <assimp/material.h>
4344

4445
// Disable warning for converting double to unsigned char
4546
#ifdef _WIN32

0 commit comments

Comments
 (0)