diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-07 17:02:51 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-07 17:03:29 +0300 |
| commit | 3748ca432d2d91b9e1d90774726a0fcf07d288bf (patch) | |
| tree | d957161d14176a3fdb6a1832d44cad783045ad35 /source/blender/alembic | |
| parent | fd08570665ff02dfb4d80f7943d7ac4338743fbc (diff) | |
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.
Diffstat (limited to 'source/blender/alembic')
| -rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 4 |
1 files changed, 0 insertions, 4 deletions
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); } |