Commit: 893fa598319e0d263ce48514c13c1ebbaae09cd7 Author: Campbell Barton Date: Mon Feb 25 08:54:10 2019 +1100 Branches: master https://developer.blender.org/rB893fa598319e0d263ce48514c13c1ebbaae09cd7
readfile: re-enable read on demand for WIN32 Revert workaround for T61855. It's likely this was caused by slow seek for compressed files since the same behavior happens on Linux T61880. =================================================================== M source/blender/blenloader/intern/readfile.c =================================================================== diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index bb7ff4efaa5..7c455c7c20f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -224,10 +224,12 @@ /** * Delay reading blocks we might not use (especially applies to library linking). - * which keeps large arrays in memory from data-blocks we may not even use. */ -#if !defined(_WIN32) /* Slow on windows, see: T61855 */ -# define USE_BHEAD_READ_ON_DEMAND -#endif + * which keeps large arrays in memory from data-blocks we may not even use. + * + * \note This is disabled when using compression, + * while zlib supports seek ist's unusably slow, see: T61880. + */ +#define USE_BHEAD_READ_ON_DEMAND /* use GHash for BHead name-based lookups (speeds up linking) */ #define USE_GHASH_BHEAD _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
