[Bf-blender-cvs] [04f034abadf] master: New ID Copying code: fix node_tree_copy_data still potentially increasing usercount of its gpencil pointer.
Bastien Montagne
noreply at git.blender.org
Mon Aug 14 15:43:28 CEST 2017
Commit: 04f034abadf6f3795008298b793b6acd527fad88
Author: Bastien Montagne
Date: Mon Aug 14 15:15:57 2017 +0200
Branches: master
https://developer.blender.org/rB04f034abadf6f3795008298b793b6acd527fad88
New ID Copying code: fix node_tree_copy_data still potentially increasing usercount of its gpencil pointer.
_copy_data() functions of datablocks shall never handle that, it's done
by generic calling code in library.c.
===================================================================
M source/blender/blenkernel/intern/node.c
===================================================================
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 07fdd667425..37fc434141f 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1228,10 +1228,6 @@ void BKE_node_tree_copy_data(Main *UNUSED(bmain), bNodeTree *ntree_dst, const bN
/* We never handle usercount here for own data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
- if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
- id_us_plus((ID *)ntree_dst->gpd);
- }
-
/* in case a running nodetree is copied */
ntree_dst->execdata = NULL;
More information about the Bf-blender-cvs
mailing list