Merge branch 'master' into blender2.8

2017-12-06 11:55:30 +01:00 · 2017-12-06 11:55:30 +01:00 · e9bbc10578
parent 674e1d4194 5ad3cc4e03
commit e9bbc10578
1 changed files with 3 additions and 0 deletions
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@ -1241,6 +1241,9 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree)
 			 * pipeline. No need to build dependencies for them here.
 			 */
 		}
+		else if (id_type == ID_TXT) {
+			/* Ignore script nodes. */
+		}
 		else if (bnode->type == NODE_GROUP) {
 			bNodeTree *group_ntree = (bNodeTree *)id;
 			if ((group_ntree->id.tag & LIB_TAG_DOIT) == 0) {