Commit: 0daf29b8ea1259876c41e6c82cd86346806b0765 Author: Bastien Montagne Date: Mon Feb 12 12:55:06 2018 +0100 Branches: asset-engine https://developer.blender.org/rB0daf29b8ea1259876c41e6c82cd86346806b0765
Merge branch 'blender2.8' into asset-engine Conflicts: source/blender/blenkernel/intern/blender.c =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/blender.c index 2cabe2e30a4,e9a6d0fe5a5..6a3a1ea6bb9 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@@ -47,7 -45,7 +47,8 @@@ #include "IMB_imbuf.h" #include "IMB_moviecache.h" + #include "BKE_addon.h" +#include "BKE_asset_engine.h" #include "BKE_blender.h" /* own include */ #include "BKE_blender_version.h" /* own include */ #include "BKE_blendfile.h" _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs