Merge branch 'blender-v3.1-release'
This commit is contained in:
commit
96492903aa
|
@ -1143,12 +1143,7 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph,
|
|||
* we need to apply these back onto the Mesh. If we have no
|
||||
* Mesh then we need to build one. */
|
||||
if (mesh_final == nullptr) {
|
||||
/* NOTE: this check on cdmask is a bit dodgy, it handles the issue at stake here (see T68211),
|
||||
* but other cases might require similar handling?
|
||||
* Could be a good idea to define a proper CustomData_MeshMask for that then. */
|
||||
if (deformed_verts == nullptr && allow_shared_mesh &&
|
||||
(final_datamask.lmask & CD_MASK_NORMAL) == 0 &&
|
||||
(final_datamask.pmask & CD_MASK_NORMAL) == 0) {
|
||||
if (deformed_verts == nullptr && allow_shared_mesh) {
|
||||
mesh_final = mesh_input;
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -2436,16 +2436,18 @@ void ED_node_link_insert(Main *bmain, ScrArea *area)
|
|||
bNodeSocket *best_input = get_main_socket(ntree, *node_to_insert, SOCK_IN);
|
||||
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 && 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 && 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;
|
||||
if (node_to_insert->type != NODE_REROUTE) {
|
||||
/* Ignore main sockets when the types don't match. */
|
||||
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 && 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;
|
||||
}
|
||||
}
|
||||
|
||||
bNode *from_node = old_link->fromnode;
|
||||
|
|
Loading…
Reference in New Issue