diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2025-06-10 12:58:18 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2025-06-10 12:59:03 +0200 |
| commit | 488a2f7af2920295ada886f113a0d563dab79b8d (patch) | |
| tree | 60618a0947d45081caf6c5038cee9706e4af4ae0 /code/AssetLib/IFC/IFCUtil.cpp | |
| parent | 647f94648c0ae24b9c6684383a9dbbc0e2fc23b7 (diff) | |
| parent | fb375dd8c0a032106a2122815fb18dffe0283721 (diff) | |
Merge tag 'v6.0.2' into qt6_assimpqt6_assimp
Change-Id: I70ab8ef899f760cfa3ef8406419ecdb976d6ffc3
Diffstat (limited to 'code/AssetLib/IFC/IFCUtil.cpp')
| -rw-r--r-- | code/AssetLib/IFC/IFCUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/code/AssetLib/IFC/IFCUtil.cpp b/code/AssetLib/IFC/IFCUtil.cpp index 3977e22b5..bf24d4fff 100644 --- a/code/AssetLib/IFC/IFCUtil.cpp +++ b/code/AssetLib/IFC/IFCUtil.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER -#include "AssetLib/IFC/IFCUtil.h" +#include "IFCUtil.h" #include "Common/PolyTools.h" #include "Geometry/GeometryUtils.h" #include "PostProcessing/ProcessHelper.h" @@ -375,7 +375,7 @@ void TempMesh::RemoveAdjacentDuplicates() { ArrayBounds(&*base, cnt ,vmin,vmax); const IfcFloat epsilon = (vmax-vmin).SquareLength() / static_cast<IfcFloat>(1e9); - + // drop any identical, adjacent vertices. this pass will collect the dropouts // of the previous pass as a side-effect. FuzzyVectorCompare fz(epsilon); @@ -461,7 +461,7 @@ void ConvertColor(aiColor4D& out, const Schema_2x3::IfcColourRgb& in) { } // ------------------------------------------------------------------------------------------------ -void ConvertColor(aiColor4D& out, +void ConvertColor(aiColor4D& out, const Schema_2x3::IfcColourOrFactor& in, ConversionData& conv, const aiColor4D* base) { |