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:58:13 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-12-06 13:58:13 +0300
commit8cd4de7c25b02f1f35c39a96e2e4fd62cf47d849 (patch)
tree334dc2d48f4c7995083f8fb79c638a23f3bfca3a /source/blender/depsgraph
parente9bbc10578cf3dd458f3adac9b2358ce1a65a6ec (diff)
parentb5be65dc0efec52e1fb0074405c541ca5e2c7ea4 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 5c984535cb8..14dedef2601 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1821,6 +1821,9 @@ void DepsgraphRelationBuilder::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) {