diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-23 19:18:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-23 19:18:36 +0300 |
| commit | 4795d6bdb15fe097ee132baa27e387581eb012ad (patch) | |
| tree | 791422c7339b5bf9a8750d2e0e775c446cf56906 /source/blender/blenloader/intern/readfile.c | |
| parent | cbe64753838a7a2f02d69519ec174af8a4605c3b (diff) | |
| parent | af4a04eae07184f7437a8c51858a4ddb8a2e3e4c (diff) | |
Merge branch 'master' into id-remap
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e29f6374243..773ebb121b4 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4927,6 +4927,9 @@ static void direct_link_pose(FileData *fd, bPose *pose) pchan->child = newdataadr(fd, pchan->child); pchan->custom_tx = newdataadr(fd, pchan->custom_tx); + pchan->bbone_prev = newdataadr(fd, pchan->bbone_prev); + pchan->bbone_next = newdataadr(fd, pchan->bbone_next); + direct_link_constraints(fd, &pchan->constraints); pchan->prop = newdataadr(fd, pchan->prop); @@ -6160,6 +6163,11 @@ static void direct_link_gpencil(FileData *fd, bGPdata *gpd) for (gps = gpf->strokes.first; gps; gps = gps->next) { gps->points = newdataadr(fd, gps->points); + + /* the triangulation is not saved, so need to be recalculated */ + gps->flag |= GP_STROKE_RECALC_CACHES; + gps->triangles = NULL; + gps->tot_triangles = 0; } } } @@ -6928,6 +6936,7 @@ static bool direct_link_screen(FileData *fd, bScreen *sc) /* render can be quite heavy, set to solid on load */ if (v3d->drawtype == OB_RENDER) v3d->drawtype = OB_SOLID; + v3d->prev_drawtype = OB_SOLID; if (v3d->fx_settings.dof) v3d->fx_settings.dof = newdataadr(fd, v3d->fx_settings.dof); |