[Bf-blender-cvs] [b85be88655c] master: Fix (IRC-reported) wrong usercount handling of deprecated IPO datablocks.
Bastien Montagne
noreply at git.blender.org
Mon Jul 16 22:31:03 CEST 2018
Commit: b85be88655ccc408d9545a077f33502fd583eb2e
Author: Bastien Montagne
Date: Mon Jul 16 22:29:26 2018 +0200
Branches: master
https://developer.blender.org/rBb85be88655ccc408d9545a077f33502fd583eb2e
Fix (IRC-reported) wrong usercount handling of deprecated IPO datablocks.
versionning code would unref those twice... Reported by @ßergey on IRC, thanks!
===================================================================
M source/blender/blenkernel/intern/ipo.c
===================================================================
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 9d8ca1e352c..fd8cb6d6d98 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1732,8 +1732,7 @@ void do_versions_ipos_to_animato(Main *bmain)
/* IPO first to take into any non-NLA'd Object Animation */
if (ob->ipo) {
ipo_to_animdata(bmain, id, ob->ipo, NULL, NULL, NULL);
-
- id_us_min(&ob->ipo->id);
+ /* No need to id_us_min ipo ID here, ipo_to_animdata already does it. */
ob->ipo = NULL;
}
@@ -1766,7 +1765,7 @@ void do_versions_ipos_to_animato(Main *bmain)
/* IPO second... */
if (ob->ipo) {
ipo_to_animdata(bmain, id, ob->ipo, NULL, NULL, NULL);
- id_us_min(&ob->ipo->id);
+ /* No need to id_us_min ipo ID here, ipo_to_animdata already does it. */
ob->ipo = NULL;
{
More information about the Bf-blender-cvs
mailing list