diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-14 16:23:53 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-14 19:33:12 +0300 |
| commit | 54ed0bb6538d5066d3e6ff2f3d14bfe6e26957ca (patch) | |
| tree | 6e14d5cc130d896385d32f8e5d89fc6800b1b7bf | |
| parent | e10ddc7a91b840eb630626665d987f498a7e9254 (diff) | |
Fix bad handling of datablock's nodetree id_clear_lib_data_ex().
Those data blocks are never shared, exactly as with shapekeys, much simpler
to also clear their lib_data (especially since they have no user!).
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index c2390085ad2..f570066ed16 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1483,10 +1483,8 @@ void id_clear_lib_data_ex(Main *bmain, ID *id, bool id_in_mainlist) /* internal bNodeTree blocks inside ID types below * also stores id->lib, make sure this stays in sync. */ - ntree = ntreeFromID(id); - - if (ntree) { - ntreeMakeLocal(bmain, ntree, false, false); + if ((ntree = ntreeFromID(id))) { + id_clear_lib_data_ex(bmain, &ntree->id, id_in_mainlist); } if (GS(id->name) == ID_OB) { |