From d3d9e2abbf820cfcf7bbee08fc0c5d721a612ba1 Mon Sep 17 00:00:00 2001 From: Alaska Date: Wed, 9 Feb 2022 11:25:57 +0100 Subject: [PATCH 1/3] Fix small grammatical mistake in Refraction Depth tooltip Reviewed By: jbakker Differential Revision: https://developer.blender.org/D13850 --- source/blender/makesrna/intern/rna_material.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 22a75c0d992..9cbe12d8e1a 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -819,7 +819,7 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Refraction Depth", "Approximate the thickness of the object to compute two refraction " - "event (0 is disabled)"); + "events (0 is disabled)"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); /* For Preview Render */ From fd6506626b519e08d593d4e553590f95edfd0c6a Mon Sep 17 00:00:00 2001 From: Alaska Date: Wed, 9 Feb 2022 11:28:27 +0100 Subject: [PATCH 2/3] Adjust "Show Backface" tool tip to be more accurate Reviewed By: fclem Differential Revision: https://developer.blender.org/D13849 --- source/blender/makesrna/intern/rna_material.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 9cbe12d8e1a..8c6d51b1bfa 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -791,8 +791,8 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_boolean_negative_sdna(prop, NULL, "blend_flag", MA_BL_HIDE_BACKFACE); RNA_def_property_ui_text(prop, "Show Backface", - "Limit transparency to a single layer " - "(avoids transparency sorting problems)"); + "Render multiple transparent layers " + "(may introduce transparency sorting problems)"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop = RNA_def_property(srna, "use_backface_culling", PROP_BOOLEAN, PROP_NONE); From d82384f7e1a0ae6fd3b27bb261a4cd671c9939ac Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 9 Feb 2022 12:36:20 +0100 Subject: [PATCH 3/3] Fix T95640: missing null check in previous commit --- source/blender/editors/space_node/node_relationships.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc index 2a197e93f42..d92f86c2cfc 100644 --- a/source/blender/editors/space_node/node_relationships.cc +++ b/source/blender/editors/space_node/node_relationships.cc @@ -2453,12 +2453,12 @@ void ED_node_link_insert(Main *bmain, ScrArea *area) bNodeSocket *best_output = get_main_socket(ntree, *node_to_insert, SOCK_OUT); /* Ignore main sockets when the types don't match. */ - if (best_input != nullptr && + if (best_input != nullptr && ntree.typeinfo->validate_link != nullptr && !ntree.typeinfo->validate_link(static_cast(old_link->fromsock->type), static_cast(best_input->type))) { best_input = nullptr; } - if (best_output != nullptr && + if (best_output != nullptr && ntree.typeinfo->validate_link != nullptr && !ntree.typeinfo->validate_link(static_cast(best_output->type), static_cast(old_link->tosock->type))) { best_output = nullptr;