diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-02-09 14:38:08 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-02-09 14:38:08 +0300 |
| commit | 3f061ef050ccb671f9c4c9b65a17f0d097e24344 (patch) | |
| tree | 35b793c1ff3c2d2dad78c8eb58758a372e951e40 /source/blender | |
| parent | 312c8fdaf927421e697da0185360240bafd64a4b (diff) | |
| parent | d82384f7e1a0ae6fd3b27bb261a4cd671c9939ac (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_node/node_relationships.cc | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 6 |
2 files changed, 5 insertions, 5 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<eNodeSocketDatatype>(old_link->fromsock->type), static_cast<eNodeSocketDatatype>(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<eNodeSocketDatatype>(best_output->type), static_cast<eNodeSocketDatatype>(old_link->tosock->type))) { best_output = nullptr; diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 67943b290da..6dea0dbbf7d 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); @@ -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 */ |