[Bf-blender-cvs] [b1c715a] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: b1c715a5fab56a0b66fc6613ae5e651be127a43e
Author: Bastien Montagne
Date:   Mon Apr 25 16:55:41 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBb1c715a5fab56a0b66fc6613ae5e651be127a43e

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/blenkernel/intern/blender.c
	source/blender/windowmanager/intern/wm_files.c
	source/blender/windowmanager/intern/wm_init_exit.c

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index c4eff91,afab0cc..d4e64ff
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -73,9 -73,11 +73,12 @@@ set(SR
  	intern/appdir.c
  	intern/armature.c
  	intern/armature_update.c
 +	intern/asset.c
  	intern/autoexec.c
  	intern/blender.c
+ 	intern/blender_copybuffer.c
+ 	intern/blender_undo.c
+ 	intern/blendfile.c
  	intern/bmfont.c
  	intern/boids.c
  	intern/bpath.c
@@@ -193,9 -195,12 +196,13 @@@
  	BKE_animsys.h
  	BKE_appdir.h
  	BKE_armature.h
 +	BKE_asset.h
  	BKE_autoexec.h
  	BKE_blender.h
+ 	BKE_blender_copybuffer.h
+ 	BKE_blender_undo.h
+ 	BKE_blender_version.h
+ 	BKE_blendfile.h
  	BKE_bmfont.h
  	BKE_bmfont_types.h
  	BKE_boids.h
diff --cc source/blender/blenkernel/intern/blender.c
index db133f2,15492fb..48eccb9
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@@ -64,10 -45,9 +47,10 @@@
  #include "IMB_imbuf.h"
  #include "IMB_moviecache.h"
  
- #include "BKE_appdir.h"
 +#include "BKE_asset.h"
- #include "BKE_blender.h"
- #include "BKE_bpath.h"
+ #include "BKE_blender.h"  /* own include */
+ #include "BKE_blender_version.h"  /* own include */
+ #include "BKE_blendfile.h"
  #include "BKE_brush.h"
  #include "BKE_context.h"
  #include "BKE_depsgraph.h"
@@@ -89,21 -66,9 +69,8 @@@
  
  #include "BLF_api.h"
  
- #include "BLO_undofile.h"
- #include "BLO_readfile.h" 
- #include "BLO_writefile.h" 
- 
- #include "WM_api.h" // XXXXX BAD, very BAD dependency (bad level call) - remove asap, elubie
- 
- #include "IMB_colormanagement.h"
- 
- #ifdef WITH_PYTHON
- #  include "BPY_extern.h"
- #endif
--
  Global G;
  UserDef U;
- /* ListBase = {NULL, NULL}; */
  
  char versionstr[48] = "";
  
diff --cc source/blender/windowmanager/intern/wm_files.c
index d6b9f49,5e74eff..0cceb2c
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -551,11 -553,7 +553,11 @@@ bool WM_file_read(bContext *C, const ch
  		
  		/* confusing this global... */
  		G.relbase_valid = 1;
- 		retval = BKE_read_file(C, filepath, reports);
 -		retval = BKE_blendfile_read(C, filepath, reports);
++        retval = BKE_blendfile_read(C, filepath, reports);
 +
 +		printf("Updating assets for: %s\n", filepath);
 +		WM_operator_name_call(C, "WM_OT_assets_update_check", WM_OP_EXEC_DEFAULT, NULL);
 +
  		/* when loading startup.blend's, we can be left with a blank path */
  		if (G.main->name[0]) {
  			G.save_over = 1;
@@@ -694,10 -692,7 +696,10 @@@ int wm_homefile_read(bContext *C, Repor
  	
  	if (!from_memory) {
  		if (BLI_access(startstr, R_OK) == 0) {
- 			success = (BKE_read_file(C, startstr, NULL) != BKE_READ_FILE_FAIL);
+ 			success = (BKE_blendfile_read(C, startstr, NULL) != BKE_BLENDFILE_READ_FAIL);
 +
 +			printf("Updating assets for: %s\n", startstr);
 +			WM_operator_name_call(C, "WM_OT_assets_update_check", WM_OP_EXEC_DEFAULT, NULL);
  		}
  		if (BLI_listbase_is_empty(&U.themes)) {
  			if (G.debug & G_DEBUG)
diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 53b4595,6300d2e..eea3e12
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -56,8 -53,8 +56,9 @@@
  
  #include "BLO_writefile.h"
  
 +#include "BKE_asset.h"
  #include "BKE_blender.h"
+ #include "BKE_blender_undo.h"
  #include "BKE_context.h"
  #include "BKE_screen.h"
  #include "BKE_DerivedMesh.h"
@@@ -493,13 -492,11 +494,13 @@@ void WM_exit_ext(bContext *C, const boo
  	/* render code might still access databases */
  	RE_FreeAllRender();
  	RE_engines_exit();
 -	
 +
 +	BKE_asset_engines_exit();
 +
- 	ED_preview_free_dbase();  /* frees a Main dbase, before free_blender! */
+ 	ED_preview_free_dbase();  /* frees a Main dbase, before BKE_blender_free! */
  
  	if (C && wm)
- 		wm_free_reports(C);  /* before free_blender! - since the ListBases get freed there */
+ 		wm_free_reports(C);  /* before BKE_blender_free! - since the ListBases get freed there */
  
  	BKE_sequencer_free_clipboard(); /* sequencer.c */
  	BKE_tracking_clipboard_free();