[Bf-blender-cvs] [17a8254] depsgraph_refactor: Proper init/exit for the depsgraph scheduler.

Lukas Tönne noreply at git.blender.org
Mon May 26 08:03:51 CEST 2014


Commit: 17a825435887a90720d5a32a4053091fd6ca3e90
Author: Lukas Tönne
Date:   Mon May 26 07:52:09 2014 +0200
https://developer.blender.org/rB17a825435887a90720d5a32a4053091fd6ca3e90

Proper init/exit for the depsgraph scheduler.

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

M	source/blender/blenkernel/intern/blender.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 9b93075..eac28e1 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -119,6 +119,7 @@ void free_blender(void)
 	IMB_exit();
 	BKE_images_exit();
 	DAG_exit();
+	DEG_threaded_exit();
 	DEG_free_node_types();
 
 	BKE_brush_system_exit();
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index 7bb99b8..76698d1 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -1240,6 +1240,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
 	IMB_exit();
 	BKE_images_exit();
 	DAG_exit();
+	DEG_threaded_exit();
 	DEG_free_node_types();
 
 	totblock = MEM_get_memory_blocks_in_use();
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 992ad42..b84087e 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -1636,6 +1636,7 @@ int main(
 	/* after level 1 args, this is so playanim skips RNA init */
 	RNA_init();
 
+	DEG_threaded_init();
 	RE_engines_init();
 	init_nodesystem();
 	psys_init_rng();
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index f1a2a0b..7f04ba4 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -454,6 +454,7 @@ int main(int argc, char** argv)
 	BKE_images_init();
 	BKE_modifier_init();
 	DAG_init();
+	DEG_threaded_init();
 	DEG_register_node_types();
 
 #ifdef WITH_FFMPEG
@@ -1134,6 +1135,7 @@ int main(int argc, char** argv)
 	IMB_exit();
 	BKE_images_exit();
 	DAG_exit();
+	DEG_threaded_exit();
 	DEG_free_node_types();
 	IMB_moviecache_destruct();




More information about the Bf-blender-cvs mailing list