diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-11-25 17:59:33 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-11-25 17:59:33 +0400 |
| commit | 4005cb1c6a63a217df0e887c741beee2c1359301 (patch) | |
| tree | a79e243c99e5eecc72846f71ada7ff015efac37e /source/blender/editors/object/object_edit.c | |
| parent | 65e409541c6f48b34d657b1c54ae94b4ca46d076 (diff) | |
| parent | b0ea93aa9d74d09833fa19fcff4b1f04365906ac (diff) | |
Merge branch 'master' into soc-2013-sketch_mesh
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |