blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Alembic import: prevent double user decrement when cancelling import. 

BKE_libblock_free_us() was called on the object data, which decrements
its user count, after which the same function was called on the object,
which decrements the user count of the object data again. This double
decrement was too much.
This commit is contained in:
Sybren A. Stüvel 2017-04-07 16:02:51 +02:00
parent fd08570665
commit 3748ca432d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/alembic/intern/alembic_capi.cc
View File

@ -766,10 +766,6 @@ static void import_endjob(void *user_data)
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
Object *ob = (*iter)->object();
if (ob->data) {
BKE_libblock_free_us(data->bmain, ob->data);
ob->data = NULL;
}
BKE_libblock_free_us(data->bmain, ob);
}