griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-02-29 12:34:14 +11:00
parent 860f3ed794 08e0b35b31
commit d39998318f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/build_environment/linux/linux_rocky8_setup.sh
View File

@@ -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.

4
source/blender/makesrna/intern/rna_access.cc
View File

@@ -5948,7 +5948,7 @@ static void rna_array_as_string_elem(int type, void **buf_p, int len, std::strin
case PROP_FLOAT: {
float *buf = static_cast<float *>(*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;
@@ -6078,7 +6078,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;
}
}