diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-01 04:09:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-01 04:13:14 +0300 |
commit | 909665a0d4ed23620afc537c583a6e84cdee50b9 (patch) | |
tree | ada49fe1ae8d78bc5e0c7a79fcccbc2ceaa8a8b8 /source/blender/blenloader/intern | |
parent | f70470b540b78c220f9679c6de2efb4bafc80648 (diff) |
ClangFormat: run with ReflowComments on source/
Prepare for enabling ReflowComments.
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 26 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_260.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_legacy.c | 12 |
4 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b88a2ca2167..55f02b45854 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7362,7 +7362,7 @@ static void direct_link_area(FileData *fd, ScrArea *area) link_list(fd, &sconsole->scrollback); link_list(fd, &sconsole->history); - //for (cl= sconsole->scrollback.first; cl; cl= cl->next) + // for (cl= sconsole->scrollback.first; cl; cl= cl->next) // cl->line= newdataadr(fd, cl->line); /* comma expressions, (e.g. expr1, expr2, expr3) evaluate each expression, diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index a34b441d511..face4b61d1e 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -277,7 +277,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb) ar->v2d.keepzoom |= (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_KEEPASPECT); ar->v2d.keeptot = V2D_KEEPTOT_STRICT; ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f; - //ar->v2d.flag |= V2D_IS_INITIALISED; + // ar->v2d.flag |= V2D_IS_INITIALISED; break; } case SPACE_GRAPH: { @@ -294,7 +294,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb) ar->v2d.max[0] = MAXFRAMEF; ar->v2d.max[1] = FLT_MAX; - //ar->v2d.flag |= V2D_IS_INITIALISED; + // ar->v2d.flag |= V2D_IS_INITIALISED; break; } case SPACE_NLA: { @@ -386,7 +386,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb) SpaceText *st = (SpaceText *)sl; st->flags |= ST_FIND_WRAP; } - //case SPACE_XXX: // FIXME... add other ones + // case SPACE_XXX: // FIXME... add other ones // memcpy(&ar->v2d, &((SpaceXxx *)sl)->v2d, sizeof(View2D)); // break; } @@ -645,8 +645,8 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Tex *tx; ParticleSettings *part; Object *ob; - //PTCacheID *pid; - //ListBase pidlist; + // PTCacheID *pid; + // ListBase pidlist; bSound *sound; Sequence *seq; @@ -756,12 +756,12 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* set old pointcaches to have disk cache flag */ for (ob = bmain->objects.first; ob; ob = ob->id.next) { - //BKE_ptcache_ids_from_object(&pidlist, ob); + // BKE_ptcache_ids_from_object(&pidlist, ob); - //for (pid = pidlist.first; pid; pid = pid->next) + // for (pid = pidlist.first; pid; pid = pid->next) // pid->cache->flag |= PTCACHE_DISK_CACHE; - //BLI_freelistN(&pidlist); + // BLI_freelistN(&pidlist); } /* type was a mixed flag & enum. move the 2d flag elsewhere */ @@ -780,18 +780,18 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Tex *tex; Scene *sce; ToolSettings *ts; - //PTCacheID *pid; - //ListBase pidlist; + // PTCacheID *pid; + // ListBase pidlist; for (ob = bmain->objects.first; ob; ob = ob->id.next) { - //BKE_ptcache_ids_from_object(&pidlist, ob); + // BKE_ptcache_ids_from_object(&pidlist, ob); - //for (pid = pidlist.first; pid; pid = pid->next) { + // for (pid = pidlist.first; pid; pid = pid->next) { // if (BLI_listbase_is_empty(pid->ptcaches)) // pid->ptcaches->first = pid->ptcaches->last = pid->cache; //} - //BLI_freelistN(&pidlist); + // BLI_freelistN(&pidlist); if (ob->type == OB_MESH) { Mesh *me = blo_do_versions_newlibadr(fd, lib, ob->data); diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index b26eb1f6ac9..77ef27182f2 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -1997,7 +1997,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (bmain->versionfile < 267) { - //if (!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "stencil_pos")) { + // if (!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "stencil_pos")) { Brush *brush; for (brush = bmain->brushes.first; brush; brush = brush->id.next) { diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 6329a3959b9..df26ca37826 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -1042,33 +1042,33 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (sbuts->mainb == BUTS_LAMP) { sbuts->mainb = CONTEXT_SHADING; - //sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_LAMP; + // sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_LAMP; } else if (sbuts->mainb == BUTS_MAT) { sbuts->mainb = CONTEXT_SHADING; - //sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_MAT; + // sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_MAT; } else if (sbuts->mainb == BUTS_TEX) { sbuts->mainb = CONTEXT_SHADING; - //sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_TEX; + // sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_TEX; } else if (sbuts->mainb == BUTS_ANIM) { sbuts->mainb = CONTEXT_OBJECT; } else if (sbuts->mainb == BUTS_WORLD) { sbuts->mainb = CONTEXT_SCENE; - //sbuts->tab[CONTEXT_SCENE] = TAB_SCENE_WORLD; + // sbuts->tab[CONTEXT_SCENE] = TAB_SCENE_WORLD; } else if (sbuts->mainb == BUTS_RENDER) { sbuts->mainb = CONTEXT_SCENE; - //sbuts->tab[CONTEXT_SCENE] = TAB_SCENE_RENDER; + // sbuts->tab[CONTEXT_SCENE] = TAB_SCENE_RENDER; } else if (sbuts->mainb == BUTS_FPAINT) { sbuts->mainb = CONTEXT_EDITING; } else if (sbuts->mainb == BUTS_RADIO) { sbuts->mainb = CONTEXT_SHADING; - //sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_RAD; + // sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_RAD; } else if (sbuts->mainb == BUTS_CONSTRAINT) { sbuts->mainb = CONTEXT_OBJECT; |