Commit: 61b3f137e7346348c44c0eedadfbe069d84eb82b Author: Julian Eisel Date: Wed Oct 7 19:18:06 2020 +0200 Branches: asset-browser https://developer.blender.org/rB61b3f137e7346348c44c0eedadfbe069d84eb82b
Merge branch 'asset-metadata' into asset-browser =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_blender_version.h index e43043b034f,bd10deb216b..aed4dad05ad --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@@ -39,7 -39,7 +39,7 @@@ extern "C" /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION - #define BLENDER_FILE_SUBVERSION 6 -#define BLENDER_FILE_SUBVERSION 7 ++#define BLENDER_FILE_SUBVERSION 8 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file diff --cc source/blender/blenloader/intern/versioning_userdef.c index 8d1f3c9a4f3,e81735c698d..e36b6f04b69 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@@ -43,9 -43,10 +43,11 @@@ #include "BKE_idprop.h" #include "BKE_keyconfig.h" #include "BKE_main.h" +#include "BKE_preferences.h" - #include "BLO_readfile.h" /* Own include. */ + #include "BLO_readfile.h" + + #include "readfile.h" /* Own include. */ #include "wm_event_types.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
