[Bf-blender-cvs] [7cf890e] asset-experiments: Merge branch 'id-remap' into asset-experiments

[Bastien Montagne]

Commit: 7cf890e126ea2989798097430a33aa2e7019bf2f
Author: Bastien Montagne
Date:   Fri May 6 13:05:49 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB7cf890e126ea2989798097430a33aa2e7019bf2f

Merge branch 'id-remap' into asset-experiments

Conflicts:
	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 8314061,e29f637..b897035
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -115,7 -113,7 +115,8 @@@
  
  #include "BKE_action.h"
  #include "BKE_armature.h"
 +#include "BKE_asset.h"
+ #include "BKE_blender_version.h"
  #include "BKE_brush.h"
  #include "BKE_cloth.h"
  #include "BKE_constraint.h"