From ddddb7bab173b040342ef99270ee71ae076d45e8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 9 Mar 2013 03:46:30 +0000 Subject: code cleanup: favor braces when blocks have mixed brace use. --- source/blender/blenloader/intern/readfile.c | 18 +++++++++++++----- source/blender/blenloader/intern/versioning_legacy.c | 4 +++- 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 95ead80e3c7..0cf33a798f2 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3246,7 +3246,9 @@ static void direct_link_curve(FileData *fd, Curve *cu) cu->strinfo= newdataadr(fd, cu->strinfo); cu->tb = newdataadr(fd, cu->tb); - if (cu->vfont == NULL) link_list(fd, &(cu->nurb)); + if (cu->vfont == NULL) { + link_list(fd, &(cu->nurb)); + } else { cu->nurb.first=cu->nurb.last= NULL; @@ -3826,8 +3828,10 @@ static void lib_link_mesh(FileData *fd, Main *main) me->mat[i] = newlibadr_us(fd, me->id.lib, me->mat[i]); } } - else me->totcol = 0; - + else { + me->totcol = 0; + } + me->ipo = newlibadr_us(fd, me->id.lib, me->ipo); // XXX: deprecated: old anim sys me->key = newlibadr_us(fd, me->id.lib, me->key); me->texcomesh = newlibadr_us(fd, me->id.lib, me->texcomesh); @@ -5715,7 +5719,9 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc } #endif } - else if (v3d->scenelock) v3d->lay = sc->scene->lay; + else if (v3d->scenelock) { + v3d->lay = sc->scene->lay; + } /* not very nice, but could help */ if ((v3d->layact & v3d->lay) == 0) v3d->layact = v3d->lay; @@ -10463,7 +10469,9 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) /* subversion */ read_file_version(fd, mainptr); } - else mainptr->curlib->filedata = NULL; + else { + mainptr->curlib->filedata = NULL; + } if (fd == NULL) { BKE_reportf_wrap(basefd->reports, RPT_WARNING, TIP_("Cannot find lib '%s'"), diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 5e1b82430f1..0fba8c4b2ab 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -1547,7 +1547,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) else if (sbuts->mainb == BUTS_EDIT) { sbuts->mainb = CONTEXT_EDITING; } - else sbuts->mainb = CONTEXT_SCENE; + else { + sbuts->mainb = CONTEXT_SCENE; + } } } } -- cgit v1.2.3