From bc0529fce23f961a6195c7e54c8776fc343bfae4 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 31 May 2010 18:51:42 +0000 Subject: [PATCH] fix bug with set_subdata --- panda/src/gobj/geomVertexArrayData.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/gobj/geomVertexArrayData.cxx b/panda/src/gobj/geomVertexArrayData.cxx index eaf6729e7a..dd20b04a07 100644 --- a/panda/src/gobj/geomVertexArrayData.cxx +++ b/panda/src/gobj/geomVertexArrayData.cxx @@ -888,8 +888,8 @@ set_subdata(size_t start, size_t size, const string &data) { if (from_size < size) { // Reduce the array. unsigned char *pointer = to_buffer.get_write_pointer(); - memmove(pointer + start + size, - pointer + start + from_size, + memmove(pointer + start + from_size, + pointer + start + size, to_buffer_orig_size - (start + size)); to_buffer.clean_realloc(to_buffer_orig_size + from_size - size); @@ -897,8 +897,8 @@ set_subdata(size_t start, size_t size, const string &data) { // Expand the array. to_buffer.clean_realloc(to_buffer_orig_size + from_size - size); unsigned char *pointer = to_buffer.get_write_pointer(); - memmove(pointer + start + size, - pointer + start + from_size, + memmove(pointer + start + from_size, + pointer + start + size, to_buffer_orig_size - (start + size)); }