[Bf-blender-cvs] [693721cc7e7] master: Fix T55462: Ungroup in Node editor crash Blender
Sergey Sharybin
noreply at git.blender.org
Fri Jan 25 16:51:04 CET 2019
Commit: 693721cc7e7d617eeb1c2198a6628bb14f731d6b
Author: Sergey Sharybin
Date: Fri Jan 25 16:49:40 2019 +0100
Branches: master
https://developer.blender.org/rB693721cc7e7d617eeb1c2198a6628bb14f731d6b
Fix T55462: Ungroup in Node editor crash Blender
If ID doesn't want to do user counting it shouldn't be in main.
===================================================================
M source/blender/blenkernel/intern/node.c
===================================================================
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index ea31ad08e61..5634d23727a 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1384,7 +1384,8 @@ void BKE_node_tree_copy_data(Main *UNUSED(bmain), bNodeTree *ntree_dst, const bN
bNodeTree *ntreeCopyTree_ex(const bNodeTree *ntree, Main *bmain, const bool do_id_user)
{
bNodeTree *ntree_copy;
- BKE_id_copy_ex(bmain, (ID *)ntree, (ID **)&ntree_copy, do_id_user ? 0 : LIB_ID_CREATE_NO_USER_REFCOUNT, false);
+ const int flag = do_id_user ? LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_MAIN : 0;
+ BKE_id_copy_ex(bmain, (ID *)ntree, (ID **)&ntree_copy, flag, false);
return ntree_copy;
}
bNodeTree *ntreeCopyTree(Main *bmain, const bNodeTree *ntree)
More information about the Bf-blender-cvs
mailing list