Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / blender.c
index fdfb4628d1a85e8a200752efbf2364ecda84d7e3..05c1a675f4775a3f530861b4575cfd0c4b931efd 100644 (file)
 #include "BKE_brush.h"
 #include "BKE_cachefile.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_node.h"
 #include "BKE_report.h"
@@ -62,6 +62,8 @@
 #include "BKE_screen.h"
 #include "BKE_sequencer.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RE_pipeline.h"
 #include "RE_render_ext.h"
 
@@ -87,7 +89,7 @@ void BKE_blender_free(void)
        IMB_exit();
        BKE_cachefiles_exit();
        BKE_images_exit();
-       DAG_exit();
+       DEG_free_node_types();
 
        BKE_brush_system_exit();
        RE_texture_rng_exit();  
@@ -96,6 +98,8 @@ void BKE_blender_free(void)
 
        BKE_sequencer_cache_destruct();
        IMB_moviecache_destruct();
+
+       BKE_layer_exit();
        
        free_nodesystem();
 }