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/intern/text.c | |
parent | dbca1afefa700f25198761624cdb9f1fd21095d2 (diff) | |
parent | eeb9e5316a615f0e5052b28eee4966c4e2ed1152 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/text.c')
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 9a6db855694..9444e605e6d 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -448,7 +448,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(Main *bmain, Text *ta) +Text *BKE_text_copy(Main *bmain, const Text *ta) { Text *tan; TextLine *line, *tmp; |