From 41d4a1986548e66a652221e4a68c52900474eeff Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 08:24:14 +0200 Subject: ClangFormat: format '#if 0' code in source/ --- source/blender/blenloader/intern/readfile.c | 3 ++- source/blender/blenloader/intern/versioning_270.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e05edfdd44e..6acf0a76fa9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3724,7 +3724,8 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree) bNodeInstanceHash *new_previews = BKE_node_instance_hash_new("node previews"); bNodeInstanceHashIterator iter; - NODE_INSTANCE_HASH_ITER(iter, ntree->previews) { + NODE_INSTANCE_HASH_ITER(iter, ntree->previews) + { bNodePreview *preview = BKE_node_instance_hash_iterator_get_value(&iter); if (preview) { bNodePreview *new_preview = newimaadr(fd, preview); diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index df56809869f..69416f08205 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1156,9 +1156,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Copy over the settings stored in the GP datablock linked to the scene, for minimal disruption */ ts->gpencil_v3d_align = 0; - if (gpd->flag & GP_DATA_VIEWALIGN) ts->gpencil_v3d_align |= GP_PROJECT_VIEWSPACE; - if (gpd->flag & GP_DATA_DEPTH_VIEW) ts->gpencil_v3d_align |= GP_PROJECT_DEPTH_VIEW; - if (gpd->flag & GP_DATA_DEPTH_STROKE) ts->gpencil_v3d_align |= GP_PROJECT_DEPTH_STROKE; + if (gpd->flag & GP_DATA_VIEWALIGN) + ts->gpencil_v3d_align |= GP_PROJECT_VIEWSPACE; + if (gpd->flag & GP_DATA_DEPTH_VIEW) + ts->gpencil_v3d_align |= GP_PROJECT_DEPTH_VIEW; + if (gpd->flag & GP_DATA_DEPTH_STROKE) + ts->gpencil_v3d_align |= GP_PROJECT_DEPTH_STROKE; if (gpd->flag & GP_DATA_DEPTH_STROKE_ENDPOINTS) ts->gpencil_v3d_align |= GP_PROJECT_DEPTH_STROKE_ENDPOINTS; -- cgit v1.2.3