From 36e217142f0eeab8f0817396bc236534bb476851 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 29 Feb 2024 10:12:20 +1100 Subject: [PATCH 1/2] Build: remove svn from Linux build deps script --- build_files/build_environment/linux/linux_rocky8_setup.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build_files/build_environment/linux/linux_rocky8_setup.sh b/build_files/build_environment/linux/linux_rocky8_setup.sh index 6a14f40e0b3..8f3e3562e53 100644 --- a/build_files/build_environment/linux/linux_rocky8_setup.sh +++ b/build_files/build_environment/linux/linux_rocky8_setup.sh @@ -9,8 +9,8 @@ set -e if [ `id -u` -ne 0 ]; then - echo "This script must be run as root" - exit 1 + echo "This script must be run as root" + exit 1 fi # Required by: config manager command below to enable powertools. @@ -47,8 +47,6 @@ PACKAGES_FOR_LIBS=( # Used to checkout Blender's code. git git-lfs - # Used to checkout Blender's `../lib/` directory. - subversion # Used to extract packages. bzip2 # Used to extract packages. From 08e0b35b314fad99885c8a4bc712c62d92d94039 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 29 Feb 2024 12:23:17 +1100 Subject: [PATCH 2/2] Fix C-style formatting characters shown in operator reports Caused by [0] which moved to fmtlib but left in some C-style formatting characters. [0]: f04bc75f8ce0dbef36f440ff3f840c54de9fda12 --- source/blender/makesrna/intern/rna_access.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc index 3a5c8f243ac..69243f17c86 100644 --- a/source/blender/makesrna/intern/rna_access.cc +++ b/source/blender/makesrna/intern/rna_access.cc @@ -5942,7 +5942,7 @@ static void rna_array_as_string_elem(int type, void **buf_p, int len, std::strin case PROP_FLOAT: { float *buf = static_cast(*buf_p); for (int i = 0; i < len; i++, buf++) { - ss << fmt::format((i < end || !end) ? "%g, " : "%g", *buf); + ss << fmt::format((i < end || !end) ? "{:g}, " : "{:g}", *buf); } *buf_p = buf; break; @@ -6072,7 +6072,7 @@ std::string RNA_property_as_string( bool is_first = true; for (; item->identifier; item++) { if (item->identifier[0] && item->value & val) { - ss << fmt::format(is_first ? "'%s'" : ", '%s'", item->identifier); + ss << fmt::format(is_first ? "'{}'" : ", '{}'", item->identifier); is_first = false; } }