diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-29 12:19:15 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-29 12:19:15 +0300 |
| commit | fe052ca1ff4569d2bef9f2f37a6a537cdef7016a (patch) | |
| tree | 5567766b759502078122bca62ce5b59334feb152 /source/blender/blenloader/intern | |
| parent | 0a94fbbf23073c986c001320f676c3eb6e5363f1 (diff) | |
| parent | 029bd44bbd0fc6c1c59c6cb37f9e70c4dd23f91d (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index cc10b5d9ae0..b4de51e2c6e 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3605,7 +3605,7 @@ static void direct_link_curve(FileData *fd, Curve *cu) nu->bp = newdataadr(fd, nu->bp); nu->knotsu = newdataadr(fd, nu->knotsu); nu->knotsv = newdataadr(fd, nu->knotsv); - if (cu->vfont == NULL) nu->charidx= nu->mat_nr; + if (cu->vfont == NULL) nu->charidx = 0; if (fd->flags & FD_FLAGS_SWITCH_ENDIAN) { switch_endian_knots(nu); |