From 8b56444ddeb0a78dba2258a92f7b8db413e62529 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 23 May 2016 14:47:16 -0700 Subject: [PATCH] Fix crash in GL45 buffer re-allocation --- libraries/gpu-gl/src/gpu/gl45/GL45BackendBuffer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45BackendBuffer.cpp b/libraries/gpu-gl/src/gpu/gl45/GL45BackendBuffer.cpp index b7bb04cbfb..1676b0ce1c 100644 --- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendBuffer.cpp +++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendBuffer.cpp @@ -22,7 +22,9 @@ class GL45Buffer : public gl::GLBuffer { public: GL45Buffer(const Buffer& buffer, GLBuffer* original) : Parent(buffer, allocate()) { glNamedBufferStorage(_buffer, _size, nullptr, GL_DYNAMIC_STORAGE_BIT); - glCopyNamedBufferSubData(original->_buffer, _buffer, 0, 0, std::min(original->_size, _size)); + if (original && original->_size) { + glCopyNamedBufferSubData(original->_buffer, _buffer, 0, 0, std::min(original->_size, _size)); + } Backend::setGPUObject(buffer, this); }