[Bf-blender-cvs] [722226b] master: CacheFile: make sure SpinLock is destroyed when exiting Blender.

Kévin Dietrich noreply at git.blender.org
Mon Sep 19 09:02:56 CEST 2016


Commit: 722226b61063a798fd3775e1cc4234045c3e1dbb
Author: Kévin Dietrich
Date:   Mon Sep 19 09:02:31 2016 +0200
Branches: master
https://developer.blender.org/rB722226b61063a798fd3775e1cc4234045c3e1dbb

CacheFile: make sure SpinLock is destroyed when exiting Blender.

Missed in rB62b1cdd6.

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

M	source/blender/blenkernel/BKE_cachefile.h
M	source/blender/blenkernel/intern/blender.c
M	source/blender/blenkernel/intern/cachefile.c

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

diff --git a/source/blender/blenkernel/BKE_cachefile.h b/source/blender/blenkernel/BKE_cachefile.h
index 7a9744e..b30143c 100644
--- a/source/blender/blenkernel/BKE_cachefile.h
+++ b/source/blender/blenkernel/BKE_cachefile.h
@@ -39,6 +39,7 @@ struct Main;
 struct Scene;
 
 void BKE_cachefiles_init(void);
+void BKE_cachefiles_exit(void);
 
 void *BKE_cachefile_add(struct Main *bmain, const char *name);
 
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 0805335..a867039 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -49,6 +49,7 @@
 #include "BKE_blender_version.h"  /* own include */
 #include "BKE_blendfile.h"
 #include "BKE_brush.h"
+#include "BKE_cachefile.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
@@ -84,6 +85,7 @@ void BKE_blender_free(void)
 	BKE_spacetypes_free();      /* after free main, it uses space callbacks */
 	
 	IMB_exit();
+	BKE_cachefiles_exit();
 	BKE_images_exit();
 	DAG_exit();
 
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index 502f1d5..e62e652 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -56,6 +56,11 @@ void BKE_cachefiles_init(void)
 	BLI_spin_init(&spin);
 }
 
+void BKE_cachefiles_exit(void)
+{
+	BLI_spin_end(&spin);
+}
+
 void *BKE_cachefile_add(Main *bmain, const char *name)
 {
 	CacheFile *cache_file = BKE_libblock_alloc(bmain, ID_CF, name);




More information about the Bf-blender-cvs mailing list