[Bf-blender-cvs] [3beea71b07a] blender2.8: Remove some residue of old legacy dependency graph
Sergey Sharybin
noreply at git.blender.org
Fri Oct 20 11:32:07 CEST 2017
Commit: 3beea71b07ae823bc6a75d0c1ea7abf16d626d2b
Author: Sergey Sharybin
Date: Fri Oct 20 11:26:00 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB3beea71b07ae823bc6a75d0c1ea7abf16d626d2b
Remove some residue of old legacy 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 d3aa7e8501d..1e3f6c11065 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -237,7 +237,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->theDag = NULL;
sce_dst->depsgraph_legacy = NULL;
sce_dst->obedit = NULL;
sce_dst->fps_info = NULL;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e6d534d18c0..e56218b7c90 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6094,7 +6094,6 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain)
SceneLayer *sl;
SceneRenderLayer *srl;
- sce->theDag = NULL;
sce->depsgraph_legacy = 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 14bbb0f8f44..be435cf959f 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1655,8 +1655,6 @@ typedef struct Scene {
/* none of the dependency graph vars is mean to be saved */
struct Depsgraph *depsgraph_legacy;
- void *pad1;
- struct DagForest *theDag;
short dagflags;
short pad3;
More information about the Bf-blender-cvs
mailing list