diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-15 12:04:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-15 12:06:27 +0400 |
| commit | c742a4b62b26b7878c122d8a204ccf0c2d934dde (patch) | |
| tree | 1e18832793328af3c78cbe4529f66e9a36f9dc7b /source/blender/editors/curve/editfont.c | |
| parent | e5b8d84613f3aa808adf275ea3e0dbec2d484915 (diff) | |
Code cleanup: remove '\r' check for 3d text, its removed on load even on windows
Diffstat (limited to 'source/blender/editors/curve/editfont.c')
| -rw-r--r-- | source/blender/editors/curve/editfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 5c448effcd5..bd13d383746 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -250,7 +250,7 @@ static void text_update_edited(bContext *C, Object *obedit, int mode) cu->curinfo = ef->textbufinfo[ef->pos ? ef->pos - 1 : 0]; if (obedit->totcol > 0) { - obedit->actcol = ef->textbufinfo[ef->pos ? ef->pos - 1 : 0].mat_nr; + obedit->actcol = cu->curinfo.mat_nr; /* since this array is calloc'd, it can be 0 even though we try ensure * (mat_nr > 0) almost everywhere */ |