blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Merge branch 'blender-v3.1-release'

This commit is contained in:
Jacques Lucke 2022-02-09 12:38:08 +01:00
parent 312c8fdaf9 d82384f7e1
commit 3f061ef050
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_node/node_relationships.cc
View File

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

6
source/blender/makesrna/intern/rna_material.c
View File

@ -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 */