diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
commit | 7439919ac0c4b0146cfed0ddbb8b945fe3675bcb (patch) | |
tree | 39730e1c17f939bd12e465ce597e2f24bbd91d34 /source/blender/blenkernel/BKE_text.h | |
parent | dbca1afefa700f25198761624cdb9f1fd21095d2 (diff) | |
parent | eeb9e5316a615f0e5052b28eee4966c4e2ed1152 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_text.h')
-rw-r--r-- | source/blender/blenkernel/BKE_text.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h index 081b7589af6..c8fb483cdf2 100644 --- a/source/blender/blenkernel/BKE_text.h +++ b/source/blender/blenkernel/BKE_text.h @@ -52,7 +52,7 @@ bool BKE_text_reload(struct Text *text); struct Text *BKE_text_load_ex(struct Main *bmain, const char *file, const char *relpath, const bool is_internal); struct Text *BKE_text_load (struct Main *bmain, const char *file, const char *relpath); -struct Text *BKE_text_copy (struct Main *bmain, struct Text *ta); +struct Text *BKE_text_copy (struct Main *bmain, const struct Text *ta); void BKE_text_make_local (struct Main *bmain, struct Text *text, const bool lib_local); void BKE_text_clear (struct Text *text); void BKE_text_write (struct Text *text, const char *str); |