diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-22 12:54:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-22 12:54:18 +0400 |
| commit | ffcc63a7d0ef6e0651412588ec5e8867e7e0e023 (patch) | |
| tree | 7799c26b3eed5b5c36a29f383ef0e7913ae00aff /source/blender/blenkernel/intern/scene.c | |
| parent | 3793e178f46b571a9c026e139eac1bbe59b83c82 (diff) | |
node tree functions for copy/free now support optional ID user count management,
this is not used yet, so no functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index d476e90498c..4fd08c8f6f8 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -153,8 +153,8 @@ Scene *BKE_scene_copy(Scene *sce, int type) BKE_keyingsets_copy(&(scen->keyingsets), &(sce->keyingsets)); if (sce->nodetree) { - scen->nodetree = ntreeCopyTree(sce->nodetree); /* copies actions */ - ntreeSwitchID(scen->nodetree, &sce->id, &scen->id); + scen->nodetree = ntreeCopyTree_ex(sce->nodetree, FALSE); /* TODO: do_id_user arg needs checking */ /* copies actions */ + ntreeSwitchID_ex(scen->nodetree, &sce->id, &scen->id, FALSE); } obase = sce->base.first; @@ -321,7 +321,7 @@ void BKE_scene_free(Scene *sce) } if (sce->nodetree) { - ntreeFreeTree(sce->nodetree); + ntreeFreeTree_ex(sce->nodetree, FALSE); /* TODO: do_id_user arg needs checking */ MEM_freeN(sce->nodetree); } |