From 62bd0ea5fde55a696e0a8353249ed4964d62984d Mon Sep 17 00:00:00 2001 From: Iliya Katueshenock Date: Sat, 16 Mar 2024 14:03:13 +0100 Subject: [PATCH 1/4] Fix: Geometry Nodes: GPv3 component is always in Separate Component node Makes sure the GPv3 component doesn't show up unless the experimental flag is set. Pull Request: https://projects.blender.org/blender/blender/pulls/118915 --- .../geometry/nodes/node_geo_separate_components.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc b/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc index 7b72437a197..08c4110192f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc @@ -11,7 +11,9 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input("Geometry"); b.add_output("Mesh").propagate_all(); b.add_output("Curve").propagate_all(); - b.add_output("Grease Pencil").propagate_all(); + if (U.experimental.use_grease_pencil_version3) { + b.add_output("Grease Pencil").propagate_all(); + } b.add_output("Point Cloud").propagate_all(); b.add_output("Volume") .translation_context(BLT_I18NCONTEXT_ID_ID) @@ -36,7 +38,7 @@ static void node_geo_exec(GeoNodeExecParams params) if (geometry_set.has()) { curves.add(*geometry_set.get_component()); } - if (geometry_set.has()) { + if (geometry_set.has() && U.experimental.use_grease_pencil_version3) { grease_pencil.add(*geometry_set.get_component()); } if (geometry_set.has()) { @@ -51,7 +53,9 @@ static void node_geo_exec(GeoNodeExecParams params) params.set_output("Mesh", meshes); params.set_output("Curve", curves); - params.set_output("Grease Pencil", grease_pencil); + if (U.experimental.use_grease_pencil_version3) { + params.set_output("Grease Pencil", grease_pencil); + } params.set_output("Point Cloud", point_clouds); params.set_output("Volume", volumes); params.set_output("Instances", instances); From b8a3560a772a5f1e2a1e4db103a6c2e604bb60ee Mon Sep 17 00:00:00 2001 From: Alaska Date: Sat, 16 Mar 2024 19:34:16 +0100 Subject: [PATCH 2/4] Fix #119545: Error drawing Cycles denoising settings with NONE device Pull Request: https://projects.blender.org/blender/blender/pulls/119547 --- intern/cycles/blender/addon/properties.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 07392fddd96..9a7fc4911fd 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1606,14 +1606,15 @@ class CyclesPreferences(bpy.types.AddonPreferences): compute_device_type = self.get_compute_device_type() # We need non-CPU devices, used for rendering and supporting OIDN GPU denoising - for device in _cycles.available_devices(compute_device_type): - device_type = device[1] - if device_type == 'CPU': - continue + if compute_device_type != 'NONE': + for device in _cycles.available_devices(compute_device_type): + device_type = device[1] + if device_type == 'CPU': + continue - has_device_oidn_support = device[5] - if has_device_oidn_support and self.find_existing_device_entry(device).use: - return True + has_device_oidn_support = device[5] + if has_device_oidn_support and self.find_existing_device_entry(device).use: + return True return False From 1058006e032daa9cea331965799b04184fabec59 Mon Sep 17 00:00:00 2001 From: Guillermo Venegas Date: Sat, 16 Mar 2024 19:34:49 +0100 Subject: [PATCH 3/4] Fix #119549: Avoid resetting properties tagged as `SKIP_PRESET` Excludes properties tagged as `SKIP_PRESET` from being reset. Pull Request: https://projects.blender.org/blender/blender/pulls/119550 --- source/blender/windowmanager/intern/wm_operators.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 4bba9bee6dd..b4170f1419b 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -786,7 +786,7 @@ void WM_operator_properties_reset(wmOperator *op) RNA_PROP_BEGIN (op->ptr, itemptr, iterprop) { PropertyRNA *prop = static_cast(itemptr.data); - if ((RNA_property_flag(prop) & PROP_SKIP_SAVE) == 0) { + if ((RNA_property_flag(prop) & (PROP_SKIP_SAVE | PROP_SKIP_PRESET)) == 0) { const char *identifier = RNA_property_identifier(prop); RNA_struct_idprops_unset(op->ptr, identifier); } From 714ebd6890c2539478c491127f1f722ad8fa6c66 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 16 Mar 2024 19:44:26 +0100 Subject: [PATCH 4/4] Fix: Linux libraries have files stored as LFS that shouldn't be --- lib/linux_x64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linux_x64 b/lib/linux_x64 index 42ada8a6153..87f8577ceac 160000 --- a/lib/linux_x64 +++ b/lib/linux_x64 @@ -1 +1 @@ -Subproject commit 42ada8a61530ec4927a639c60150bbf0e145ede8 +Subproject commit 87f8577ceac51577e2753541da4d49963110b59d