[Bf-blender-cvs] [1155fc94fd1] master: Fix T52454: Crash in DEG_graph_on_visible_update when activating scene layer

[Sergey Sharybin]

Commit: 1155fc94fd1826620c2901e6b36a4020ca88ff69
Author: Sergey Sharybin
Date:   Tue Aug 22 12:52:28 2017 +0200
Branches: master
https://developer.blender.org/rB1155fc94fd1826620c2901e6b36a4020ca88ff69

Fix T52454: Crash in DEG_graph_on_visible_update when activating scene layer

Most likely needs in 2.79 final release.

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

M	source/blender/depsgraph/intern/depsgraph_tag.cc

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

diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 31b4bbc7950..b30110732a2 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -347,6 +347,12 @@ void DEG_graph_on_visible_update(Main *bmain, Scene *scene)
 		GHASH_FOREACH_END();
 	}
 	scene->lay_updated |= graph->layers;
+	/* If graph is tagged for update, we don't need to bother with updates here,
+	 * nodes will be re-created.
+	 */
+	if (graph->need_update) {
+		return;
+	}
 	/* Special trick to get local view to work.  */
 	LINKLIST_FOREACH (Base *, base, &scene->base) {
 		Object *object = base->object;