[Bf-blender-cvs] [3748ca432d2] master: Alembic import: prevent double user decrement when cancelling import.

[Sybren A. Stüvel]

Commit: 3748ca432d2d91b9e1d90774726a0fcf07d288bf
Author: Sybren A. Stüvel
Date:   Fri Apr 7 16:02:51 2017 +0200
Branches: master
https://developer.blender.org/rB3748ca432d2d91b9e1d90774726a0fcf07d288bf

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.

===================================================================

M	source/blender/alembic/intern/alembic_capi.cc

===================================================================

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);
 		}