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>2016-11-11 17:28:34 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-01-20 13:36:56 +0300
commit8ddc85ab597d5ee873989b7765c7c5f068dfee35 (patch)
treee7d85db702b7b8c359501b6dc83b15e6d3c75ed3
parentd3963e2bb0c5e4d481c7f06671ac0da7df5d868f (diff)
Depsgraph: Add missing NULL pointer check
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 8cf0fdff915..9eeff9f79f6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -463,7 +463,9 @@ void DepsgraphNodeBuilder::build_object(Scene *scene, Base *base, Object *ob)
{
if (ob->id.tag & LIB_TAG_DOIT) {
IDDepsNode *id_node = m_graph->find_id_node(&ob->id);
- id_node->layers |= base->lay;
+ if (base != NULL) {
+ id_node->layers |= base->lay;
+ }
return;
}
ob->id.tag |= LIB_TAG_DOIT;