Commit: 780310578a0c39fa9badde0010f1e1ee8a8a9194
Author: Lukas Stockner
Date: Sun Jun 18 05:13:32 2017 +0200
Branches: id_copy_refactor
https://developer.blender.org/rB780310578a0c39fa9badde0010f1e1ee8a8a9194
Fix unreported: Copy-pasting nodes crashes when they have an undefined type
===================================================================
M source/blender/editors/space_node/node_edit.c
===================================================================
diff --git a/source/blender/editors/space_node/node_edit.c
b/source/blender/editors/space_node/node_edit.c
index 9dc39b1839b..5f8f839025f 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -2086,7 +2086,7 @@ static int node_clipboard_paste_exec(bContext *C,
wmOperator *op)
/* make sure all clipboard nodes would be valid in the target tree */
all_nodes_valid = true;
for (node = clipboard_nodes_lb->first; node; node = node->next) {
- if (!node->typeinfo->poll_instance(node, ntree)) {
+ if (!node->typeinfo->poll_instance ||
!node->typeinfo->poll_instance(node, ntree)) {
all_nodes_valid = false;
BKE_reportf(op->reports, RPT_ERROR, "Cannot add node %s
into node tree %s", node->name, ntree->id.name + 2);
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
