From 9aa3c630668369b9fdcdd765b1b53e53096cee69 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 21 Sep 2024 11:11:09 +0000 Subject: [PATCH 1/9] Rebuild for assimp 5.4.3 --- .ci_support/migrations/assimp543.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/assimp543.yaml diff --git a/.ci_support/migrations/assimp543.yaml b/.ci_support/migrations/assimp543.yaml new file mode 100644 index 0000000..e0f94ce --- /dev/null +++ b/.ci_support/migrations/assimp543.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for assimp 5.4.3 + kind: version + migration_number: 1 +assimp: +- 5.4.3 +migrator_ts: 1725100349.1005585 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b90c409..a26057c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,7 @@ source: - apple_disable_profiler_error_test.patch build: - number: 6 + number: 7 outputs: - name: {{ cxx_name }} From 15783fd0dd8953599494daff394b0bf441cd1643 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 21 Sep 2024 11:12:21 +0000 Subject: [PATCH 2/9] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.21.07.11.35 --- .ci_support/linux_64_ffmpeg6.yaml | 2 +- .ci_support/linux_64_ffmpeg7.yaml | 2 +- .ci_support/linux_aarch64_ffmpeg6.yaml | 2 +- .ci_support/linux_aarch64_ffmpeg7.yaml | 2 +- .ci_support/linux_ppc64le_ffmpeg6.yaml | 4 +++- .ci_support/linux_ppc64le_ffmpeg7.yaml | 4 +++- .ci_support/osx_64_ffmpeg6.yaml | 2 +- .ci_support/osx_64_ffmpeg7.yaml | 2 +- .ci_support/osx_arm64_ffmpeg6.yaml | 2 +- .ci_support/osx_arm64_ffmpeg7.yaml | 2 +- .ci_support/win_64_ffmpeg6.yaml | 2 +- .ci_support/win_64_ffmpeg7.yaml | 2 +- .scripts/build_steps.sh | 2 ++ .scripts/run_win_build.bat | 4 ++-- README.md | 5 ----- build-locally.py | 5 ++++- 16 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.ci_support/linux_64_ffmpeg6.yaml b/.ci_support/linux_64_ffmpeg6.yaml index d1f46c1..0bdb37e 100644 --- a/.ci_support/linux_64_ffmpeg6.yaml +++ b/.ci_support/linux_64_ffmpeg6.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_64_ffmpeg7.yaml b/.ci_support/linux_64_ffmpeg7.yaml index 549536c..24accde 100644 --- a/.ci_support/linux_64_ffmpeg7.yaml +++ b/.ci_support/linux_64_ffmpeg7.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_ffmpeg6.yaml b/.ci_support/linux_aarch64_ffmpeg6.yaml index d0b2dd8..0398a95 100644 --- a/.ci_support/linux_aarch64_ffmpeg6.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6.yaml @@ -1,7 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu assimp: -- 5.4.2 +- 5.4.3 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_ffmpeg7.yaml b/.ci_support/linux_aarch64_ffmpeg7.yaml index 75fb401..db610cb 100644 --- a/.ci_support/linux_aarch64_ffmpeg7.yaml +++ b/.ci_support/linux_aarch64_ffmpeg7.yaml @@ -1,7 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu assimp: -- 5.4.2 +- 5.4.3 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_ffmpeg6.yaml b/.ci_support/linux_ppc64le_ffmpeg6.yaml index da0b6eb..00a7e29 100644 --- a/.ci_support/linux_ppc64le_ffmpeg6.yaml +++ b/.ci_support/linux_ppc64le_ffmpeg6.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 c_compiler: - gcc c_compiler_version: @@ -24,6 +24,8 @@ ffmpeg: - '6' glib: - '2' +libgdal: +- '3.9' libuuid: - '2' target_platform: diff --git a/.ci_support/linux_ppc64le_ffmpeg7.yaml b/.ci_support/linux_ppc64le_ffmpeg7.yaml index ae166ab..875cef3 100644 --- a/.ci_support/linux_ppc64le_ffmpeg7.yaml +++ b/.ci_support/linux_ppc64le_ffmpeg7.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 c_compiler: - gcc c_compiler_version: @@ -24,6 +24,8 @@ ffmpeg: - '7' glib: - '2' +libgdal: +- '3.9' libuuid: - '2' target_platform: diff --git a/.ci_support/osx_64_ffmpeg6.yaml b/.ci_support/osx_64_ffmpeg6.yaml index 967a9dd..ff2154c 100644 --- a/.ci_support/osx_64_ffmpeg6.yaml +++ b/.ci_support/osx_64_ffmpeg6.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.13' assimp: -- 5.4.2 +- 5.4.3 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_ffmpeg7.yaml b/.ci_support/osx_64_ffmpeg7.yaml index 3409756..4639ba7 100644 --- a/.ci_support/osx_64_ffmpeg7.yaml +++ b/.ci_support/osx_64_ffmpeg7.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.13' assimp: -- 5.4.2 +- 5.4.3 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_ffmpeg6.yaml b/.ci_support/osx_arm64_ffmpeg6.yaml index e42463a..3c9dc55 100644 --- a/.ci_support/osx_arm64_ffmpeg6.yaml +++ b/.ci_support/osx_arm64_ffmpeg6.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' assimp: -- 5.4.2 +- 5.4.3 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_ffmpeg7.yaml b/.ci_support/osx_arm64_ffmpeg7.yaml index f4d31ab..f8c4f77 100644 --- a/.ci_support/osx_arm64_ffmpeg7.yaml +++ b/.ci_support/osx_arm64_ffmpeg7.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' assimp: -- 5.4.2 +- 5.4.3 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/win_64_ffmpeg6.yaml b/.ci_support/win_64_ffmpeg6.yaml index 2ecf7cc..f7c699c 100644 --- a/.ci_support/win_64_ffmpeg6.yaml +++ b/.ci_support/win_64_ffmpeg6.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 c_compiler: - vs2019 c_stdlib: diff --git a/.ci_support/win_64_ffmpeg7.yaml b/.ci_support/win_64_ffmpeg7.yaml index 0cd6c25..c9cef83 100644 --- a/.ci_support/win_64_ffmpeg7.yaml +++ b/.ci_support/win_64_ffmpeg7.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 c_compiler: - vs2019 c_stdlib: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/README.md b/README.md index c46b6f6..43132ab 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,6 @@ This feedstock builds several conda packages from the gz-common source code, the If you need to depend at build time on the C++ package, please depend on `libgz-common5` in your recipe. -On `linux-ppc64le` the `libgz-common5` does not contain the geospatial component as in that platform the `gdal` dependency is not available. - Current build status ==================== @@ -252,6 +250,3 @@ Feedstock Maintainers * [@Tobias-Fischer](https://github.com/Tobias-Fischer/) * [@traversaro](https://github.com/traversaro/) - - - diff --git a/build-locally.py b/build-locally.py index d78427b..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform From 1db7aeb0ee948e0a6ec12910f8fb45fa3513ecd4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 21 Sep 2024 13:35:54 +0200 Subject: [PATCH 3/9] Create 634.patch --- recipe/634.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 recipe/634.patch diff --git a/recipe/634.patch b/recipe/634.patch new file mode 100644 index 0000000..ebfd3ee --- /dev/null +++ b/recipe/634.patch @@ -0,0 +1,35 @@ +From 2cd063d2584639f49b4c676fca27ab98daf9782a Mon Sep 17 00:00:00 2001 +From: Ian Chen +Date: Thu, 5 Sep 2024 20:32:36 +0000 +Subject: [PATCH] Test fixing texcoords + +Signed-off-by: Ian Chen +--- + graphics/src/AssimpLoader.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc +index bcbd7096..4cf8cf33 100644 +--- a/graphics/src/AssimpLoader.cc ++++ b/graphics/src/AssimpLoader.cc +@@ -650,14 +650,14 @@ SubMesh AssimpLoader::Implementation::CreateSubMesh( + subMesh.AddVertex(vertex); + subMesh.AddNormal(normal); + // Iterate over sets of texture coordinates +- int uvIdx = 0; +- while(_assimpMesh->HasTextureCoords(uvIdx)) ++ for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) + { ++ if (!_assimpMesh->HasTextureCoords(i)) ++ continue; + math::Vector3d texcoords; +- texcoords.X(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].x); +- texcoords.Y(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].y); +- subMesh.AddTexCoordBySet(texcoords.X(), texcoords.Y(), uvIdx); +- ++uvIdx; ++ texcoords.X(_assimpMesh->mTextureCoords[i][vertexIdx].x); ++ texcoords.Y(_assimpMesh->mTextureCoords[i][vertexIdx].y); ++ subMesh.AddTexCoordBySet(texcoords.X(), texcoords.Y(), i); + } + } + for (unsigned faceIdx = 0; faceIdx < _assimpMesh->mNumFaces; ++faceIdx) From 697351ca81d8b39dce7d6d2f357a3e94b3a466e0 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 21 Sep 2024 13:36:11 +0200 Subject: [PATCH 4/9] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a26057c..a0baf1e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,6 +17,7 @@ source: - librt_linkage.patch # [linux] - macro_path_binary_relocation.patch - apple_disable_profiler_error_test.patch + - 634.patch build: number: 7 From 7afa307c184192d1aa86dd3a2610a61ff2139d37 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Mon, 23 Sep 2024 08:03:35 +1000 Subject: [PATCH 5/9] Update 634.patch --- recipe/634.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/634.patch b/recipe/634.patch index ebfd3ee..090c259 100644 --- a/recipe/634.patch +++ b/recipe/634.patch @@ -9,10 +9,10 @@ Signed-off-by: Ian Chen 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc -index bcbd7096..4cf8cf33 100644 +index f0bcf194..5f8220c8 100644 --- a/graphics/src/AssimpLoader.cc +++ b/graphics/src/AssimpLoader.cc -@@ -650,14 +650,14 @@ SubMesh AssimpLoader::Implementation::CreateSubMesh( +@@ -650,15 +650,14 @@ SubMesh AssimpLoader::Implementation::CreateSubMesh( subMesh.AddVertex(vertex); subMesh.AddNormal(normal); // Iterate over sets of texture coordinates @@ -25,7 +25,8 @@ index bcbd7096..4cf8cf33 100644 math::Vector3d texcoords; - texcoords.X(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].x); - texcoords.Y(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].y); -- subMesh.AddTexCoordBySet(texcoords.X(), texcoords.Y(), uvIdx); +- // TODO(luca) why do we need 1.0 - Y? +- subMesh.AddTexCoordBySet(texcoords.X(), 1.0 - texcoords.Y(), uvIdx); - ++uvIdx; + texcoords.X(_assimpMesh->mTextureCoords[i][vertexIdx].x); + texcoords.Y(_assimpMesh->mTextureCoords[i][vertexIdx].y); From 94485b4dbfa01ced8518d6bc0b0be83e36af203d Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Mon, 23 Sep 2024 08:52:21 +1000 Subject: [PATCH 6/9] Update 634.patch --- recipe/634.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/634.patch b/recipe/634.patch index 090c259..b314f98 100644 --- a/recipe/634.patch +++ b/recipe/634.patch @@ -30,7 +30,7 @@ index f0bcf194..5f8220c8 100644 - ++uvIdx; + texcoords.X(_assimpMesh->mTextureCoords[i][vertexIdx].x); + texcoords.Y(_assimpMesh->mTextureCoords[i][vertexIdx].y); -+ subMesh.AddTexCoordBySet(texcoords.X(), texcoords.Y(), i); ++ subMesh.AddTexCoordBySet(texcoords.X(), 1.0 - texcoords.Y(), i); } } for (unsigned faceIdx = 0; faceIdx < _assimpMesh->mNumFaces; ++faceIdx) From 45759e3623040f0511e21947b96caf7947475165 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 24 Sep 2024 06:11:47 +1000 Subject: [PATCH 7/9] Delete recipe/634.patch --- recipe/634.patch | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 recipe/634.patch diff --git a/recipe/634.patch b/recipe/634.patch deleted file mode 100644 index b314f98..0000000 --- a/recipe/634.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2cd063d2584639f49b4c676fca27ab98daf9782a Mon Sep 17 00:00:00 2001 -From: Ian Chen -Date: Thu, 5 Sep 2024 20:32:36 +0000 -Subject: [PATCH] Test fixing texcoords - -Signed-off-by: Ian Chen ---- - graphics/src/AssimpLoader.cc | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc -index f0bcf194..5f8220c8 100644 ---- a/graphics/src/AssimpLoader.cc -+++ b/graphics/src/AssimpLoader.cc -@@ -650,15 +650,14 @@ SubMesh AssimpLoader::Implementation::CreateSubMesh( - subMesh.AddVertex(vertex); - subMesh.AddNormal(normal); - // Iterate over sets of texture coordinates -- int uvIdx = 0; -- while(_assimpMesh->HasTextureCoords(uvIdx)) -+ for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) - { -+ if (!_assimpMesh->HasTextureCoords(i)) -+ continue; - math::Vector3d texcoords; -- texcoords.X(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].x); -- texcoords.Y(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].y); -- // TODO(luca) why do we need 1.0 - Y? -- subMesh.AddTexCoordBySet(texcoords.X(), 1.0 - texcoords.Y(), uvIdx); -- ++uvIdx; -+ texcoords.X(_assimpMesh->mTextureCoords[i][vertexIdx].x); -+ texcoords.Y(_assimpMesh->mTextureCoords[i][vertexIdx].y); -+ subMesh.AddTexCoordBySet(texcoords.X(), 1.0 - texcoords.Y(), i); - } - } - for (unsigned faceIdx = 0; faceIdx < _assimpMesh->mNumFaces; ++faceIdx) From 7be5ca32c4e8d5ed570ce1cca0734436aad754f4 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 24 Sep 2024 06:12:15 +1000 Subject: [PATCH 8/9] Create 641.patch --- recipe/641.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 recipe/641.patch diff --git a/recipe/641.patch b/recipe/641.patch new file mode 100644 index 0000000..416d90a --- /dev/null +++ b/recipe/641.patch @@ -0,0 +1,66 @@ +From df5f9654d7c3420fd923fd0c2a88e4b72d10e261 Mon Sep 17 00:00:00 2001 +From: Ian Chen +Date: Thu, 5 Sep 2024 15:13:31 -0700 +Subject: [PATCH] Fix AssimpLoader collada texture coordinates (#634) + +Fixes UNIT_AssimpLoader_TEST with assimp 5.4.3. This should fix homebrew CI. + +This PR tweaks the way we checks for texture coordinates from assimp. Empty texture coordinate slots are now allowed as of assimp/assimp#5636. The new logic should be compatible with assimp 5.4.3 and prior versions + +Signed-off-by: Ian Chen +--- + graphics/src/AssimpLoader.cc | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc +index f0bcf194..52edddbd 100644 +--- a/graphics/src/AssimpLoader.cc ++++ b/graphics/src/AssimpLoader.cc +@@ -650,15 +650,14 @@ SubMesh AssimpLoader::Implementation::CreateSubMesh( + subMesh.AddVertex(vertex); + subMesh.AddNormal(normal); + // Iterate over sets of texture coordinates +- int uvIdx = 0; +- while(_assimpMesh->HasTextureCoords(uvIdx)) ++ for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) + { ++ if (!_assimpMesh->HasTextureCoords(i)) ++ continue; + math::Vector3d texcoords; +- texcoords.X(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].x); +- texcoords.Y(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].y); +- // TODO(luca) why do we need 1.0 - Y? +- subMesh.AddTexCoordBySet(texcoords.X(), 1.0 - texcoords.Y(), uvIdx); +- ++uvIdx; ++ texcoords.X(_assimpMesh->mTextureCoords[i][vertexIdx].x); ++ texcoords.Y(_assimpMesh->mTextureCoords[i][vertexIdx].y); ++ subMesh.AddTexCoordBySet(texcoords.X(), texcoords.Y(), i); + } + } + for (unsigned faceIdx = 0; faceIdx < _assimpMesh->mNumFaces; ++faceIdx) +@@ -695,6 +694,7 @@ Mesh *AssimpLoader::Load(const std::string &_filename) + aiProcess_JoinIdenticalVertices | + aiProcess_RemoveRedundantMaterials | + aiProcess_SortByPType | ++ aiProcess_FlipUVs | + #ifndef GZ_ASSIMP_PRE_5_2_0 + aiProcess_PopulateArmatureData | + #endif +@@ -756,11 +756,17 @@ Mesh *AssimpLoader::Load(const std::string &_filename) + // Recursive call to keep track of transforms, + // mesh is passed by reference and edited throughout + this->dataPtr->RecursiveCreate(scene, rootNode, rootTransform, mesh); ++ auto rootSkeleton = mesh->MeshSkeleton(); + // Add the animations + for (unsigned animIdx = 0; animIdx < scene->mNumAnimations; ++animIdx) + { + auto& anim = scene->mAnimations[animIdx]; + auto animName = ToString(anim->mName); ++ if (animName.empty()) ++ { ++ animName = "animation" + ++ std::to_string(rootSkeleton->AnimationCount() + 1); ++ } + SkeletonAnimation* skelAnim = new SkeletonAnimation(animName); + for (unsigned chanIdx = 0; chanIdx < anim->mNumChannels; ++chanIdx) + { From 3ff635400fd35939583b0203a8fbaebcabddcd62 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 24 Sep 2024 06:12:50 +1000 Subject: [PATCH 9/9] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a0baf1e..2b4549a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - librt_linkage.patch # [linux] - macro_path_binary_relocation.patch - apple_disable_profiler_error_test.patch - - 634.patch + - 641.patch build: number: 7