[Bf-blender-cvs] [99d216c] depsgraph_refactor: Depsgraph: Make it closer to master

[Sergey Sharybin]

Commit: 99d216c0dc50efeae57d123598121ff7a99dfdb3
Author: Sergey Sharybin
Date:   Wed Feb 11 15:10:56 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB99d216c0dc50efeae57d123598121ff7a99dfdb3

Depsgraph: Make it closer to master

Were some intermediate changes which are no longer needed.

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

M	source/blender/windowmanager/CMakeLists.txt
M	source/blender/windowmanager/SConscript
M	source/blender/windowmanager/intern/wm_playanim.c
M	source/gameengine/GamePlayer/ghost/CMakeLists.txt
M	source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
M	source/gameengine/GamePlayer/ghost/SConscript

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

diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 8c40306..78b5d49 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -30,7 +30,6 @@ set(INC
 	../blenlib
 	../blenloader
 	../compositor
-	../depsgraph
 	../editors/include
 	../gpu
 	../imbuf
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript
index 8365e8c..a6f64f7 100644
--- a/source/blender/windowmanager/SConscript
+++ b/source/blender/windowmanager/SConscript
@@ -43,7 +43,6 @@ incs = [
     '../blenlib',
     '../blenloader',
     '../compositor',
-    '../depsgraph',
     '../editors/include',
     '../gpu',
     '../imbuf',
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index 4fb4882..232c9ad 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -61,8 +61,6 @@
 #include "BKE_depsgraph.h"
 #include "BKE_image.h"
 
-#include "DEG_depsgraph.h"
-
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index 2ac7842..a1bc7e8 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -42,7 +42,6 @@ set(INC
 	../../../blender/blenkernel
 	../../../blender/blenlib
 	../../../blender/blenloader
-	../../../blender/depsgraph
 	../../../blender/gpu
 	../../../blender/imbuf
 	../../../blender/makesdna
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index d61d97e..915fe61 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -77,8 +77,6 @@ extern "C"
 #include "BKE_text.h"
 #include "BKE_sound.h"
 
-#include "DEG_depsgraph.h"
-
 #include "IMB_imbuf.h"
 #include "IMB_moviecache.h"
 	
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index 8a307d6..610abcd 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -55,7 +55,6 @@ incs = [
     '#source/blender/blenkernel',
     '#source/blender',
     '#source/blender/include',
-    '#source/blender/depsgraph',
     '#source/blender/makesdna',
     '#source/blender/makesrna',
     '#source/gameengine/Rasterizer',