Merge branch 'master' into blender2.8

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 1ec5b347168..006cf8275a7 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -90,14 +90,14 @@ void BKE_blender_free(void)
 	}
 
 	BKE_spacetypes_free();      /* after free main, it uses space callbacks */
-	
+
 	IMB_exit();
 	BKE_cachefiles_exit();
 	BKE_images_exit();
 	DEG_free_node_types();
 
 	BKE_brush_system_exit();
-	RE_texture_rng_exit();	
+	RE_texture_rng_exit();
 
 	BLI_callback_global_finalize();
 
@@ -122,7 +122,7 @@ void BKE_blender_version_string(char *version_str, size_t maxncpy, short version
 void BKE_blender_globals_init(void)
 {
 	memset(&G, 0, sizeof(Global));
-	
+
 	U.savetime = 1;
 
 	G_MAIN = BKE_main_new();
@@ -325,7 +325,7 @@ int BKE_blender_test_break(void)
 		if (blender_test_break_cb)
 			blender_test_break_cb();
 	}
-	
+
 	return (G.is_break == true);
 }