[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60301] branches/soc-2013-vse/source/ blender/windowmanager: Adding proper exit code for OpenCL device manager and VSE engine

Alexander Kuznetsov kuzsasha at gmail.com
Sun Sep 22 07:24:46 CEST 2013


Revision: 60301
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60301
Author:   alexk
Date:     2013-09-22 05:24:46 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
Adding proper exit code for OpenCL device manager and VSE engine

Modified Paths:
--------------
    branches/soc-2013-vse/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2013-vse/source/blender/windowmanager/intern/wm_init_exit.c

Modified: branches/soc-2013-vse/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/soc-2013-vse/source/blender/windowmanager/CMakeLists.txt	2013-09-22 05:21:08 UTC (rev 60300)
+++ branches/soc-2013-vse/source/blender/windowmanager/CMakeLists.txt	2013-09-22 05:24:46 UTC (rev 60301)
@@ -36,9 +36,12 @@
 	../makesdna
 	../makesrna
 	../nodes
+	../cldm
+	../sequencer
 	../render/extern/include
 	../../gameengine/BlenderRoutines
 	../../../intern/ghost
+	../../../intern/opencl
 	../../../intern/guardedalloc
 	../../../intern/memutil
 )

Modified: branches/soc-2013-vse/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/soc-2013-vse/source/blender/windowmanager/intern/wm_init_exit.c	2013-09-22 05:21:08 UTC (rev 60300)
+++ branches/soc-2013-vse/source/blender/windowmanager/intern/wm_init_exit.c	2013-09-22 05:24:46 UTC (rev 60301)
@@ -117,6 +117,9 @@
 #include "BKE_sound.h"
 #include "COM_compositor.h"
 
+#include "CLDM_init.h"
+#include "sequencer_main.h"
+
 static void wm_init_reports(bContext *C)
 {
 	BKE_reports_init(CTX_wm_reports(C), RPT_STORE);
@@ -446,10 +449,14 @@
 
 	BKE_sequencer_free_clipboard(); /* sequencer.c */
 	BKE_tracking_clipboard_free();
+
+	SEQ_Engine_exit();
 		
 #ifdef WITH_COMPOSITOR
 	COM_deinitialize();
 #endif
+
+	CLDM_exit();
 	
 	free_blender();  /* blender.c, does entire library and spacetypes */
 //	free_matcopybuf();




More information about the Bf-blender-cvs mailing list