svn merge ^/trunk/blender -r47210:47214

This commit is contained in:
2012-05-30 09:28:37 +00:00
2 changed files with 10 additions and 1 deletions

View File

@@ -4052,7 +4052,16 @@ static void lib_link_object(FileData *fd, Main *main)
warn = 1; warn = 1;
if (ob->pose) { if (ob->pose) {
/* we can't call #BKE_pose_free() here because of library linking
* freeing will recurse down into every pose constraints ID pointers
* which are not always valid, so for now free directly and suffer
* some leaked memory rather then crashing immediately
* while bad this _is_ an exceptional case - campbell */
#if 0
BKE_pose_free(ob->pose); BKE_pose_free(ob->pose);
#else
MEM_freeN(ob->pose);
#endif
ob->pose= NULL; ob->pose= NULL;
ob->mode &= ~OB_MODE_POSE; ob->mode &= ~OB_MODE_POSE;
} }

View File

@@ -45,7 +45,7 @@ MemoryManagerState::~MemoryManagerState()
delete buffer; delete buffer;
} }
} }
delete this->chunkBuffers; delete [] this->chunkBuffers;
BLI_mutex_end(&this->mutex); BLI_mutex_end(&this->mutex);
} }