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

[Bastien Montagne]

Commit: cb691959676602705770324749b11ae1259e8727
Author: Bastien Montagne
Date:   Fri Aug 26 22:03:58 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBcb691959676602705770324749b11ae1259e8727

Merge branch 'master' into asset-engine

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



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

diff --cc source/creator/creator.c
index 741fcec,a59a45f..77818f4
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@@ -50,13 -50,11 +50,14 @@@
  #include "BLI_callbacks.h"
  #include "BLI_string.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"
  #include "BKE_context.h"
  #include "BKE_depsgraph.h" /* for DAG_init */
  #include "BKE_font.h"