Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-12-21 10:16:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-12-21 10:16:14 +0300
commit5fef3c3326dabbe5330647208212ce7ceb311168 (patch)
tree3d7d2e4aa76e12faeef3c4aef7df864a19f0b7f4 /source/blender/blenkernel/intern/text.c
parent46af314bd96a9d1e267698df5c074dd4fc4cc6e2 (diff)
BLI_storage: Split text/binary version of mem-from-file funcs
Fix T47022, caused by own commit de0119d08
Diffstat (limited to 'source/blender/blenkernel/intern/text.c')
-rw-r--r--source/blender/blenkernel/intern/text.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index cdc48551b11..299fea2e897 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -362,7 +362,7 @@ bool BKE_text_reload(Text *text)
BLI_strncpy(filepath_abs, text->name, FILE_MAX);
BLI_path_abs(filepath_abs, G.main->name);
- buffer = BLI_file_read_as_mem(filepath_abs, 0, &buffer_len);
+ buffer = BLI_file_read_text_as_mem(filepath_abs, 0, &buffer_len);
if (buffer == NULL) {
return false;
}
@@ -401,7 +401,7 @@ Text *BKE_text_load_ex(Main *bmain, const char *file, const char *relpath, const
if (relpath) /* can be NULL (bg mode) */
BLI_path_abs(filepath_abs, relpath);
- buffer = BLI_file_read_as_mem(filepath_abs, 0, &buffer_len);
+ buffer = BLI_file_read_text_as_mem(filepath_abs, 0, &buffer_len);
if (buffer == NULL) {
return false;
}