Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-12-06 13:55:30 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-12-06 13:55:30 +0300
commite9bbc10578cf3dd458f3adac9b2358ce1a65a6ec (patch)
treea32ca8587bcdbb4b86ea5bbb82fec29d49e14856 /source/blender/depsgraph
parent674e1d419410ced7cab4af7aa85f9618faf65647 (diff)
parent5ad3cc4e03e1b656fc2afb0dcf89601dd38ae0fa (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index d9634b525e1..8fbd1e7a46d 100644
--- 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) {