[Bf-blender-cvs] [106e8fb] depsgraph_refactor: Depsgraph: Get rid of redundant depsgraph initialization call

[Sergey Sharybin]

Commit: 106e8fb5e5c408dbd9c477d4acda83adcc4880f8
Author: Sergey Sharybin
Date:   Mon Dec 29 20:23:08 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB106e8fb5e5c408dbd9c477d4acda83adcc4880f8

Depsgraph: Get rid of redundant depsgraph initialization call

Better to keep it a single public function call which we'll just
rename in the future.

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

M       source/blender/blenkernel/intern/blender.c
M       source/blender/blenkernel/intern/depsgraph.c
M       source/blender/windowmanager/intern/wm_playanim.c
M       source/creator/creator.c
M       source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

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

diff --git a/source/blender/blenkernel/intern/blender.c 
b/source/blender/blenkernel/intern/blender.c
index 501ab42..e7b49ad 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -121,7 +121,6 @@ void free_blender(void)
        IMB_exit();
        BKE_images_exit();
        DAG_exit();
-       DEG_free_node_types();
 
        BKE_brush_system_exit();
        RE_exit_texture_rng();  
diff --git a/source/blender/blenkernel/intern/depsgraph.c 
b/source/blender/blenkernel/intern/depsgraph.c
index afb2077..aae3bbd 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -100,11 +100,13 @@ static SpinLock threaded_update_lock;
 void DAG_init(void)
 {
        BLI_spin_init(&threaded_update_lock);
+       DEG_register_node_types();
 }
 
 void DAG_exit(void)
 {
        BLI_spin_end(&threaded_update_lock);
+       DEG_free_node_types();
 }
 
 /* Queue and stack operations for dag traversal 
@@ -3284,12 +3286,12 @@ bool DAG_is_acyclic(Scene *scene)
 
 void DAG_init(void)
 {
-#pragma message "need to be re-implemented actually"
+       DEG_register_node_types();
 }
 
 void DAG_exit(void)
 {
-#pragma message "need to be re-implemented actually"
+       DEG_free_node_types();
 }
 
 DagNodeQueue *queue_create(int UNUSED(slots))
diff --git a/source/blender/windowmanager/intern/wm_playanim.c 
b/source/blender/windowmanager/intern/wm_playanim.c
index 304e95f..4fb4882 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -1261,7 +1261,6 @@ static char *wm_main_playanim_intern(int argc, const char 
**argv)
        IMB_exit();
        BKE_images_exit();
        DAG_exit();
-       DEG_free_node_types();
 
        totblock = MEM_get_memory_blocks_in_use();
        if (totblock != 0) {
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 3043bb9..b421e63 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -1584,7 +1584,6 @@ int main(
        BKE_images_init();
        BKE_modifier_init();
        DAG_init();
-       DEG_register_node_types();
 
        BKE_brush_system_init();
        RE_init_texture_rng();
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 
b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index a29cbbc..d61d97e 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -466,7 +466,6 @@ int main(int argc, char** argv)
        BKE_images_init();
        BKE_modifier_init();
        DAG_init();
-       DEG_register_node_types();
 
 #ifdef WITH_FFMPEG
        IMB_ffmpeg_init();
@@ -1145,7 +1144,6 @@ int main(int argc, char** argv)
        IMB_exit();
        BKE_images_exit();
        DAG_exit();
-       DEG_free_node_types();
        IMB_moviecache_destruct();
 
        SYS_DeleteSystem(syshandle);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs