Merge branch 'master' into blender2.8

This commit is contained in:
Sergey Sharybin 2018-11-12 12:16:31 +01:00
commit 3a05331445

@ -21,6 +21,13 @@
CCL_NAMESPACE_BEGIN
// NOTE: For some reason gcc-7.2 does not instantiate this versio of allocator
// gere (used in IESTextParser). Works fine for gcc-6, gcc-7.3 and gcc-8.
//
// TODO(sergey): Get to the root of this issue, or confirm this i a compiler
// issue.
template class GuardedAllocator<char>;
bool IESFile::load(ustring ies)
{
clear();