From a3124b1b48f1912f334c9fb4818d43d0d24cdd2b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 22 Feb 2024 13:56:33 +0100 Subject: [PATCH] Point submodules to the main branch Also update submodule hashes to point to the main branch of the submodules. Pull Request: https://projects.blender.org/blender/blender/pulls/118612 --- .gitmodules | 12 ++++++------ lib/linux_x64 | 2 +- lib/macos_arm64 | 2 +- lib/macos_x64 | 2 +- lib/windows_x64 | 2 +- release/datafiles/assets | 2 +- tests/data | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8a1e0cc6aa4..5805a7b20dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,28 +2,28 @@ update = none path = lib/linux_x64 url = https://projects.blender.org/blender/lib-linux_x64.git - branch = blender-v4.1-release + branch = main [submodule "lib/macos_arm64"] update = none path = lib/macos_arm64 url = https://projects.blender.org/blender/lib-macos_arm64.git - branch = blender-v4.1-release + branch = main [submodule "lib/macos_x64"] update = none path = lib/macos_x64 url = https://projects.blender.org/blender/lib-macos_x64.git - branch = blender-v4.1-release + branch = main [submodule "lib/windows_x64"] update = none path = lib/windows_x64 url = https://projects.blender.org/blender/lib-windows_x64.git - branch = blender-v4.1-release + branch = main [submodule "release/datafiles/assets"] path = release/datafiles/assets url = https://projects.blender.org/blender/blender-assets.git - branch = blender-v4.1-release + branch = main [submodule "tests/data"] update = none path = tests/data url = https://projects.blender.org/blender/blender-test-data.git - branch = blender-v4.1-release + branch = main diff --git a/lib/linux_x64 b/lib/linux_x64 index 591fce4abaa..d2eea8a8a6b 160000 --- a/lib/linux_x64 +++ b/lib/linux_x64 @@ -1 +1 @@ -Subproject commit 591fce4abaa409b31482e515c6d1b95143f58114 +Subproject commit d2eea8a8a6b22d6ec6849deea72e141fc5b384d4 diff --git a/lib/macos_arm64 b/lib/macos_arm64 index 0b09ac9de15..6c8139034cf 160000 --- a/lib/macos_arm64 +++ b/lib/macos_arm64 @@ -1 +1 @@ -Subproject commit 0b09ac9de1557c296cb483355fc9528db707dbd4 +Subproject commit 6c8139034cfb05f8dee9f6648d31443792c160b5 diff --git a/lib/macos_x64 b/lib/macos_x64 index 9af47e50115..bf950af1a7d 160000 --- a/lib/macos_x64 +++ b/lib/macos_x64 @@ -1 +1 @@ -Subproject commit 9af47e501151474c23afa1a6f5a8b1a419a122ba +Subproject commit bf950af1a7d197675bd28ce7d4920ba2b4a0a4f6 diff --git a/lib/windows_x64 b/lib/windows_x64 index 58cb225fe46..2935423fe06 160000 --- a/lib/windows_x64 +++ b/lib/windows_x64 @@ -1 +1 @@ -Subproject commit 58cb225fe4643c4879fb274078e5477c50c0429c +Subproject commit 2935423fe0636157750feef1fc02d8d0c3efd9dd diff --git a/release/datafiles/assets b/release/datafiles/assets index a5b6ba8fe49..38a8f38d989 160000 --- a/release/datafiles/assets +++ b/release/datafiles/assets @@ -1 +1 @@ -Subproject commit a5b6ba8fe49679a8b1105c3e80b3e190a97942c0 +Subproject commit 38a8f38d98987efc9aebe878ca941d99756e914e diff --git a/tests/data b/tests/data index 44b6f5d4d18..b9e47e0e1b2 160000 --- a/tests/data +++ b/tests/data @@ -1 +1 @@ -Subproject commit 44b6f5d4d180edb700db848be9208efe6f59c9a2 +Subproject commit b9e47e0e1b2ae394f54a30dc47b2d8e358fc33bd