diff options
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index ca1ae23c364..f60823edcc8 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -138,14 +138,20 @@ void IDP_ResizeIDPArray(IDProperty *prop, int newlen) /*first check if the array buffer size has room*/ /*if newlen is 200 chars less then totallen, reallocate anyway*/ - if (newlen <= prop->totallen && prop->totallen - newlen < 200) { - int i; + if (newlen <= prop->totallen) { + if (newlen < prop->len && prop->totallen - newlen < 200) { + int i; - for (i = newlen; i < prop->len; i++) - IDP_FreeProperty(GETPROP(prop, i)); + for (i = newlen; i < prop->len; i++) + IDP_FreeProperty(GETPROP(prop, i)); - prop->len = newlen; - return; + prop->len = newlen; + return; + } + else if (newlen >= prop->len) { + prop->len = newlen; + return; + } } /* - Note: This code comes from python, here's the corresponding comment. - */ |