diff options
Diffstat (limited to 'source/blender/blenkernel/intern/text.c')
| -rw-r--r-- | source/blender/blenkernel/intern/text.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 77629715edb..86c7f6fcd1a 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -446,7 +446,7 @@ Text *BKE_text_load(Main *bmain, const char *file, const char *relpath) return BKE_text_load_ex(bmain, file, relpath, false); } -Text *BKE_text_copy(Text *ta) +Text *BKE_text_copy(Main *bmain, Text *ta) { Text *tan; TextLine *line, *tmp; @@ -455,8 +455,17 @@ Text *BKE_text_copy(Text *ta) /* file name can be NULL */ if (ta->name) { - tan->name = MEM_mallocN(strlen(ta->name) + 1, "text_name"); - strcpy(tan->name, ta->name); + if (ta->id.lib && BLI_path_is_rel(ta->name)) { + char tname[FILE_MAXFILE]; + /* If path is relative, and source is a lib, path is relative to lib file, not main one! */ + BLI_strncpy(tname, ta->name, sizeof(tname)); + BLI_path_abs(tname, ta->id.lib->filepath); + BLI_path_rel(tname, bmain->name); + tan->name = BLI_strdup(tname); + } + else { + tan->name = BLI_strdup(ta->name); + } } else { tan->name = NULL; |