diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 17:42:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 17:42:35 +0300 |
| commit | 521222b545aa5c88c8ac6ba1b4086c329df4b702 (patch) | |
| tree | 7dcc158abdb194f33f589be5ea558c4d30476dd2 /source/blender/blenkernel/intern/text.c | |
| parent | 4a298b10ec465f59f7db804ae9cb299fc921cda7 (diff) | |
| parent | 1870e166deaa4ced1bb5226e97e037db10dbd06c (diff) | |
Merge branch 'master' into asset-engine
Diffstat (limited to 'source/blender/blenkernel/intern/text.c')
| -rw-r--r-- | source/blender/blenkernel/intern/text.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 82c3132d73e..1636042f479 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -491,10 +491,7 @@ Text *BKE_text_copy(Main *bmain, Text *ta) init_undo_text(tan); - if (ID_IS_LINKED_DATABLOCK(ta)) { - BKE_id_expand_local(&tan->id); - BKE_id_lib_local_paths(bmain, ta->id.lib, &tan->id); - } + BKE_id_copy_ensure_local(bmain, &ta->id, &tan->id); return tan; } |