diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-05 01:23:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-05 01:23:59 +0300 |
| commit | 1c2b5430cafa1cecf051632465693d9aa5079ce6 (patch) | |
| tree | 459430c55816dc81f22409e267ae38234570d407 /source/blender/blenkernel/intern/library_remap.c | |
| parent | ef746be9826ee87ced68f27c81ec6fbf6bb7140f (diff) | |
| parent | 57bcc19bb389e682d14032398138966329deb52a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/library_remap.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 255904841b2..02128ae9c3a 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -550,8 +550,12 @@ void BKE_libblock_remap_locked( id_us_clear_real(old_id); } - BLI_assert(old_id->us - skipped_refcounted >= 0); - UNUSED_VARS_NDEBUG(skipped_refcounted); + if (old_id->us - skipped_refcounted < 0) { + printf("Error in remapping process from '%s' (%p) to '%s' (%p): " + "wrong user count in old ID after process (summing up to %d)\n", + old_id->name, old_id, new_id ? new_id->name : "<NULL>", new_id, old_id->us - skipped_refcounted); + BLI_assert(0); + } if (skipped_direct == 0) { /* old_id is assumed to not be used directly anymore... */ |