diff options
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b2536935663..3127540b837 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7286,8 +7286,9 @@ static void direct_link_area(FileData *fd, ScrArea *area) * committed: r28002 */ #if 0 sima->gpd = newdataadr(fd, sima->gpd); - if (sima->gpd) + if (sima->gpd) { direct_link_gpencil(fd, sima->gpd); + } #endif } else if (sl->spacetype == SPACE_NODE) { @@ -9844,8 +9845,9 @@ static BHead *find_bhead(FileData *fd, void *old) #if 0 for (bhead = blo_bhead_first(fd); bhead; bhead = blo_bhead_next(fd, bhead)) { - if (bhead->old == old) + if (bhead->old == old) { return bhead; + } } #endif diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 20b2bfd95c8..4adbbac8cae 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1168,15 +1168,19 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) * for minimal disruption. */ ts->gpencil_v3d_align = 0; - if (gpd->flag & GP_DATA_VIEWALIGN) + if (gpd->flag & GP_DATA_VIEWALIGN) { ts->gpencil_v3d_align |= GP_PROJECT_VIEWSPACE; - if (gpd->flag & GP_DATA_DEPTH_VIEW) + } + if (gpd->flag & GP_DATA_DEPTH_VIEW) { ts->gpencil_v3d_align |= GP_PROJECT_DEPTH_VIEW; - if (gpd->flag & GP_DATA_DEPTH_STROKE) + } + if (gpd->flag & GP_DATA_DEPTH_STROKE) { ts->gpencil_v3d_align |= GP_PROJECT_DEPTH_STROKE; + } - if (gpd->flag & GP_DATA_DEPTH_STROKE_ENDPOINTS) + if (gpd->flag & GP_DATA_DEPTH_STROKE_ENDPOINTS) { ts->gpencil_v3d_align |= GP_PROJECT_DEPTH_STROKE_ENDPOINTS; + } } else { /* Default to cursor for all standard 3D views */ |