diff --git a/code/glTF2/glTF2Asset.h b/code/glTF2/glTF2Asset.h index d3c1654d0..3af9e4a7b 100644 --- a/code/glTF2/glTF2Asset.h +++ b/code/glTF2/glTF2Asset.h @@ -398,7 +398,7 @@ namespace glTF2 inline uint8_t* GetPointer(); template - bool ExtractData(T*& outData); + void ExtractData(T*& outData); void WriteData(size_t count, const void* src_buffer, size_t src_stride); diff --git a/code/glTF2/glTF2Asset.inl b/code/glTF2/glTF2Asset.inl index 35ecfa62d..d7876cfca 100644 --- a/code/glTF2/glTF2Asset.inl +++ b/code/glTF2/glTF2Asset.inl @@ -637,10 +637,12 @@ namespace { } template -bool Accessor::ExtractData(T*& outData) +void Accessor::ExtractData(T*& outData) { uint8_t* data = GetPointer(); - if (!data) return false; + if (!data) { + throw DeadlyImportError("GLTF: data is NULL"); + } const size_t elemSize = GetElementSize(); const size_t totalSize = elemSize * count; @@ -661,8 +663,6 @@ bool Accessor::ExtractData(T*& outData) memcpy(outData + i, data + i*stride, elemSize); } } - - return true; } inline void Accessor::WriteData(size_t count, const void* src_buffer, size_t src_stride)