[Bf-blender-cvs] [2a838c7] master: Depsgraph: Add missing NULL pointer check

Sergey Sharybin noreply at git.blender.org
Fri Nov 11 15:28:50 CET 2016


Commit: 2a838c71d9ceba30bb2ec00f303f2d3484b37314
Author: Sergey Sharybin
Date:   Fri Nov 11 15:28:34 2016 +0100
Branches: master
https://developer.blender.org/rB2a838c71d9ceba30bb2ec00f303f2d3484b37314

Depsgraph: Add missing NULL pointer check

===================================================================

M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 8cf0fdf..9eeff9f 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;




More information about the Bf-blender-cvs mailing list