[Bf-blender-cvs] [7824b6e506a] asset-engine: Merge branch 'blender2.8' into asset-engine

[Bastien Montagne]

Commit: 7824b6e506a6cee7b314106998ccd7e3014af669
Author: Bastien Montagne
Date:   Tue Apr 3 17:53:20 2018 +0200
Branches: asset-engine
https://developer.blender.org/rB7824b6e506a6cee7b314106998ccd7e3014af669

Merge branch 'blender2.8' into asset-engine

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

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



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

diff --cc source/blender/windowmanager/intern/wm_event_system.c
index 61b38a85b4c,33bbb624192..7a470fa19e9
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -70,7 -69,10 +72,8 @@@
  #include "ED_screen.h"
  #include "ED_view3d.h"
  #include "ED_util.h"
+ #include "ED_undo.h"
  
 -#include "RNA_access.h"
 -
  #include "UI_interface.h"
  
  #include "PIL_time.h"
diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 1db91804646,4c7c2cc96e4..723fcea04f0
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -40,9 -40,8 +40,11 @@@
  
  #include "MEM_guardedalloc.h"
  
 +#include "RNA_define.h"
 +#include "RNA_types.h"
 +
+ #include "CLG_log.h"
+ 
  #include "DNA_genfile.h"
  #include "DNA_scene_types.h"
  #include "DNA_userdef_types.h"
@@@ -56,8 -55,8 +58,9 @@@
  #include "BLI_utildefines.h"
  
  #include "BLO_writefile.h"
+ #include "BLO_undofile.h"
  
 +#include "BKE_asset_engine.h"
  #include "BKE_blender.h"
  #include "BKE_blender_undo.h"
  #include "BKE_context.h"
diff --cc source/creator/creator.c
index d6b2601a42f,2aa60c3e2a7..df47d49b987
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@@ -49,12 -51,10 +51,13 @@@
  #include "BLI_utildefines.h"
  #include "BLI_callbacks.h"
  #include "BLI_string.h"
+ #include "BLI_system.h"
  
 +#include "RNA_define.h"
 +
  /* mostly init functions */
  #include "BKE_appdir.h"
 +#include "BKE_asset_engine.h"
  #include "BKE_blender.h"
  #include "BKE_brush.h"
  #include "BKE_cachefile.h"