[Bf-blender-cvs] [b0760a5] asset-engine: Merge branch 'master' into asset-engine
Bastien Montagne
noreply at git.blender.org
Thu Jul 7 15:16:01 CEST 2016
Commit: b0760a5c8fa96f8399e560856f53621673fb54ec
Author: Bastien Montagne
Date: Thu Jul 7 15:15:48 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBb0760a5c8fa96f8399e560856f53621673fb54ec
Merge branch 'master' into asset-engine
Conflicts:
source/blender/blenloader/intern/readfile.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index 10c82b3,68cc060..4c854f2
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -115,8 -113,6 +115,7 @@@
#include "BKE_action.h"
#include "BKE_armature.h"
+#include "BKE_asset_engine.h"
- #include "BKE_blender_version.h"
#include "BKE_brush.h"
#include "BKE_cloth.h"
#include "BKE_constraint.h"
More information about the Bf-blender-cvs
mailing list