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>2013-11-20 21:32:28 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-11-20 21:32:28 +0400
commitd232486b4093fbc306dadbc21bd3fde81284364d (patch)
treef43a3dda70324c49df88f9c08518ae5e859879a2 /source/blender/editors
parent0af52adac044d4851b95dd238ba209593f106996 (diff)
Fix T37543: Multiline 3D Text saved in edit mode breaks on load
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/curve/editfont.c7
-rw-r--r--source/blender/editors/object/object_edit.c2
2 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 6ba54145c25..8f536575a28 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -1475,13 +1475,6 @@ void load_editText(Object *obedit)
memcpy(cu->strinfo, ef->textbufinfo, (cu->len) * sizeof(CharInfo));
cu->len = strlen(cu->str);
-
- /* this memory system is weak... */
-
- if (cu->selboxes) {
- MEM_freeN(cu->selboxes);
- cu->selboxes = NULL;
- }
}
void free_editText(Object *obedit)
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 02cbc1060df..2e011493fce 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -351,7 +351,7 @@ static bool ED_object_editmode_load_ex(Object *obedit, const bool freedata)
load_editNurb(obedit);
if (freedata) free_editNurb(obedit);
}
- else if (obedit->type == OB_FONT && freedata) {
+ else if (obedit->type == OB_FONT) {
load_editText(obedit);
if (freedata) free_editText(obedit);
}