Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / blender.c
index bc47cfde143f7c176251ff0490846e25f55d68c7..d03be79baade1514ab06b866758df0f5865952fb 100644 (file)
 #include "BKE_brush.h"
 #include "BKE_cachefile.h"
 #include "BKE_context.h"
 #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_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"
 #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 "BKE_screen.h"
 #include "BKE_sequencer.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RE_pipeline.h"
 #include "RE_render_ext.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();
        IMB_exit();
        BKE_cachefiles_exit();
        BKE_images_exit();
-       DAG_exit();
+       DEG_free_node_types();
 
        BKE_brush_system_exit();
        RE_texture_rng_exit();  
 
        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_sequencer_cache_destruct();
        IMB_moviecache_destruct();
+
+       BKE_layer_exit();
        
        free_nodesystem();
 }
        
        free_nodesystem();
 }
@@ -280,8 +284,11 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
        DATA_SWAP(font_path_ui_mono);
        DATA_SWAP(keyconfigstr);
 
        DATA_SWAP(font_path_ui_mono);
        DATA_SWAP(keyconfigstr);
 
+       DATA_SWAP(manipulator_flag);
+
        FLAG_SWAP(uiflag, int, USER_LOCK_UI_LAYOUT);
 
        FLAG_SWAP(uiflag, int, USER_LOCK_UI_LAYOUT);
 
+#undef SWAP_TYPELESS
 #undef DATA_SWAP
 #undef LIST_SWAP
 #undef FLAG_SWAP
 #undef DATA_SWAP
 #undef LIST_SWAP
 #undef FLAG_SWAP