bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Campbell Barton 2024-03-05 10:20:52 +11:00
commit 5fdd684550
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_userdef.cc
View File

@ -6915,8 +6915,10 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
prop = RNA_def_property(srna, "temporary_directory", PROP_STRING, PROP_DIRPATH);
RNA_def_property_string_sdna(prop, nullptr, "tempdir");
RNA_def_property_ui_text(
prop, "Temporary Directory", "The directory for storing temporary save files");
RNA_def_property_ui_text(prop,
"Temporary Directory",
"The directory for storing temporary save files. "
"The path must reference an existing directory or it will be ignored");
RNA_def_property_update(prop, 0, "rna_userdef_temp_update");
prop = RNA_def_property(srna, "render_cache_directory", PROP_STRING, PROP_DIRPATH);

4
source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc
View File

@ -29,8 +29,8 @@ static void node_declare(NodeDeclarationBuilder &b)
GeometryComponent::Type::PointCloud,
GeometryComponent::Type::Curve,
GeometryComponent::Type::Instance});
b.add_input<decl::Bool>("Selection").default_value(true).supports_field().hide_value();
b.add_input<decl::Int>("Group ID").supports_field().hide_value();
b.add_input<decl::Bool>("Selection").default_value(true).field_on_all().hide_value();
b.add_input<decl::Int>("Group ID").field_on_all().hide_value();
b.add_output<decl::Geometry>("Instances")
.propagate_all()
.description("All geometry groups as separate instances");

10
source/creator/creator_args.cc
View File

@ -764,12 +764,16 @@ static void print_help(bArgs *ba, bool all)
if (defs.with_ocio) {
PRINT(" $OCIO Path to override the OpenColorIO config file.\n");
}
if (defs.win32) {
PRINT(" $TEMP Store temporary files here (MS-Windows).\n");
if (defs.win32 || all) {
PRINT(" $TEMP Store temporary files here (MS-Windows).\n");
}
if (!defs.win32 || all) {
PRINT(" $TMP or $TMPDIR Store temporary files here (UNIX Systems).\n");
/* NOTE: while `TMP` checked, don't include here as it's non-standard & may be removed. */
PRINT(" $TMPDIR Store temporary files here (UNIX Systems).\n");
}
PRINT(
" The path must reference an existing directory "
"or it will be ignored.\n");
# undef printf
# undef PRINT