1 files changed, 37 insertions, 9 deletions

diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 1d5c8f76cc5..f4f25c3a153 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -53,22 +53,23 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
-#include "BKE_sequencer.h"
 #include "BKE_studiolight.h"
 
 #include "DEG_depsgraph.h"
 
 #include "RE_pipeline.h"
-#include "RE_render_ext.h"
+#include "RE_texture.h"
+
+#include "SEQ_sequencer.h"
 
 #include "BLF_api.h"
 
 Global G;
 UserDef U;
 
-static char blender_version_string[48] = "";
-
-/* ********** free ********** */
+/* -------------------------------------------------------------------- */
+/** \name Blender Free on Exit
+ * \{ */
 
 /* only to be called on exit blender */
 void BKE_blender_free(void)
@@ -99,9 +100,17 @@ void BKE_blender_free(void)
 
   IMB_moviecache_destruct();
 
-  free_nodesystem();
+  BKE_node_system_exit();
 }
 
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Blender Version Access
+ * \{ */
+
+static char blender_version_string[48] = "";
+
 static void blender_version_init(void)
 {
   const char *version_cycle = "";
@@ -141,6 +150,12 @@ bool BKE_blender_version_is_alpha(void)
   return is_alpha;
 }
 
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Blender #Global Initialize/Clear
+ * \{ */
+
 void BKE_blender_globals_init(void)
 {
   blender_version_init();
@@ -169,7 +184,11 @@ void BKE_blender_globals_clear(void)
   G_MAIN = NULL;
 }
 
-/***/
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Blender Preferences
+ * \{ */
 
 static void keymap_item_free(wmKeyMapItem *kmi)
 {
@@ -260,8 +279,8 @@ static void userdef_free_addons(UserDef *userdef)
  */
 void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts)
 {
-#define U _invalid_access_ /* ensure no accidental global access */
-#ifdef U                   /* quiet warning */
+#define U BLI_STATIC_ASSERT(false, "Global 'U' not allowed, only use arguments passed in!")
+#ifdef U /* quiet warning */
 #endif
 
   userdef_free_keymaps(userdef);
@@ -285,6 +304,12 @@ void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts)
 #undef U
 }
 
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Blender Preferences (Application Templates)
+ * \{ */
+
 /**
  * Write U from userdef.
  * This function defines which settings a template will override for the user preferences.
@@ -356,6 +381,9 @@ void BKE_blender_userdef_app_template_data_set_and_free(UserDef *userdef)
   MEM_freeN(userdef);
 }
 
+/** \} */
+
+/* -------------------------------------------------------------------- */
 /** \name Blender's AtExit
  *
  * \note Don't use MEM_mallocN so functions can be registered at any time.