[Bf-blender-cvs] [5c66bbc56f0] blender2.8: Depsgraph: Remove traces of old single-per-scene dependency graph

[Sergey Sharybin]

Commit: 5c66bbc56f08f13638a92a5e4702d138abc37ba7
Author: Sergey Sharybin
Date:   Wed Nov 8 10:27:33 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB5c66bbc56f08f13638a92a5e4702d138abc37ba7

Depsgraph: Remove traces of old single-per-scene dependency graph

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index dfa9227b679..ce2e4e62be1 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -238,7 +238,6 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons
 	const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
 
 	sce_dst->ed = NULL;
-	sce_dst->depsgraph_legacy = NULL;
 	sce_dst->depsgraph_hash = NULL;
 	sce_dst->obedit = NULL;
 	sce_dst->fps_info = NULL;
@@ -2423,8 +2422,6 @@ void BKE_scene_ensure_depsgraph_hash(Scene *scene)
 
 void BKE_scene_free_depsgraph_hash(Scene *scene)
 {
-	/* TODO(sergey): Keep this for until we get rid of depsgraph_legacy. */
-	DEG_graph_free(scene->depsgraph_legacy);
 	if (scene->depsgraph_hash == NULL) {
 		return;
 	}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e6ab8fa883b..c88deeca126 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6106,7 +6106,6 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain)
 	SceneLayer *sl;
 	SceneRenderLayer *srl;
 	
-	sce->depsgraph_legacy = NULL;
 	sce->depsgraph_hash = NULL;
 	sce->obedit = NULL;
 	sce->fps_info = NULL;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 68599a10a3e..0c491af8eeb 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1654,9 +1654,7 @@ typedef struct Scene {
 	void *fps_info;					/* (runtime) info/cache used for presenting playback framerate info to the user */
 	
 	/* none of the dependency graph  vars is mean to be saved */
-	struct Depsgraph *depsgraph_legacy;
 	struct GHash *depsgraph_hash;
-	void *pad3;
 	int pad7;
 
 	/* User-Defined KeyingSets */