From 3748ca432d2d91b9e1d90774726a0fcf07d288bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 7 Apr 2017 16:02:51 +0200 Subject: 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. --- source/blender/alembic/intern/alembic_capi.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source/blender/alembic') diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 0c9f5a1b0d6..c16a2089982 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -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); } -- cgit v1.2.3