From ecb3e0fe737c24e62add99f3fa39e305f5d66af2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 18 Jul 2015 19:02:39 +1000 Subject: Cleanup: whitespace & break placement --- source/blender/blenloader/intern/readfile.c | 17 +++++++++++------ source/blender/blenloader/intern/versioning_250.c | 18 +++++++++--------- source/blender/blenloader/intern/versioning_legacy.c | 6 ++++-- source/blender/blenloader/intern/writefile.c | 15 ++++++++++----- 4 files changed, 34 insertions(+), 22 deletions(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 2eba2b274b3..cc45af6e6f9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2107,8 +2107,9 @@ static void lib_link_fmodifiers(FileData *fd, ID *id, ListBase *list) { FMod_Python *data = (FMod_Python *)fcm->data; data->script = newlibadr(fd, id->lib, data->script); - } + break; + } } } } @@ -2166,23 +2167,26 @@ static void direct_link_fmodifiers(FileData *fd, ListBase *list) if (fd->flags & FD_FLAGS_SWITCH_ENDIAN) { BLI_endian_switch_float_array(data->coefficients, data->arraysize); } - } + break; + } case FMODIFIER_TYPE_ENVELOPE: { FMod_Envelope *data= (FMod_Envelope *)fcm->data; data->data= newdataadr(fd, data->data); - } + break; + } case FMODIFIER_TYPE_PYTHON: { FMod_Python *data = (FMod_Python *)fcm->data; data->prop = newdataadr(fd, data->prop); IDP_DirectLinkGroup_OrFree(&data->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); - } + break; + } } } } @@ -4554,7 +4558,7 @@ static void lib_link_object(FileData *fd, Main *main) bCameraActuator *ca = act->data; ca->ob= newlibadr(fd, ob->id.lib, ca->ob); } - /* leave this one, it's obsolete but necessary to read for conversion */ + /* leave this one, it's obsolete but necessary to read for conversion */ else if (act->type == ACT_ADD_OBJECT) { bAddObjectActuator *eoa = act->data; if (eoa) eoa->ob= newlibadr(fd, ob->id.lib, eoa->ob); @@ -8375,8 +8379,9 @@ static void expand_fmodifiers(FileData *fd, Main *mainvar, ListBase *list) FMod_Python *data = (FMod_Python *)fcm->data; expand_doit(fd, mainvar, data->script); - } + break; + } } } } diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 2727f3a3965..43ebab7856c 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -807,7 +807,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) } #undef SEQ_USE_PROXY_CUSTOM_DIR #undef SEQ_USE_PROXY_CUSTOM_FILE - } + } SEQ_END } } @@ -1589,7 +1589,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) bAnimVizSettings *avs = &ob->pose->avs; /* ghosting settings ---------------- */ - /* ranges */ + /* ranges */ avs->ghost_bc = avs->ghost_ac = arm->ghostep; avs->ghost_sf = arm->ghostsf; @@ -1599,19 +1599,19 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) avs->ghost_ef = 100; } - /* type */ + /* type */ if (arm->ghostep == 0) avs->ghost_type = GHOST_TYPE_NONE; else avs->ghost_type = arm->ghosttype + 1; - /* stepsize */ + /* stepsize */ avs->ghost_step = arm->ghostsize; if (avs->ghost_step == 0) avs->ghost_step = 1; /* path settings --------------------- */ - /* ranges */ + /* ranges */ avs->path_bc = arm->pathbc; avs->path_ac = arm->pathac; if ((avs->path_bc == avs->path_ac) && (avs->path_bc == 0)) @@ -1624,7 +1624,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) avs->path_ef = 250; } - /* flags */ + /* flags */ if (arm->pathflag & ARM_PATH_FNUMS) avs->path_viewflag |= MOTIONPATH_VIEW_FNUMS; if (arm->pathflag & ARM_PATH_KFRAS) @@ -1632,15 +1632,15 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) if (arm->pathflag & ARM_PATH_KFNOS) avs->path_viewflag |= MOTIONPATH_VIEW_KFNOS; - /* bake flags */ + /* bake flags */ if (arm->pathflag & ARM_PATH_HEADS) avs->path_bakeflag |= MOTIONPATH_BAKE_HEADS; - /* type */ + /* type */ if (arm->pathflag & ARM_PATH_ACFRA) avs->path_type = MOTIONPATH_TYPE_ACFRA; - /* stepsize */ + /* stepsize */ avs->path_step = arm->pathsize; if (avs->path_step == 0) avs->path_step = 1; diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 1819dcd4d43..dcfafc26e4f 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -2401,8 +2401,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) data->flag |= MINMAX_STICKY; else data->flag &= ~MINMAX_STICKY; - } + break; + } case CONSTRAINT_TYPE_ROTLIKE: { bRotateLikeConstraint *data = curcon->data; @@ -2410,8 +2411,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) /* version patch from buttons_object.c */ if (data->flag == 0) data->flag = ROTLIKE_X|ROTLIKE_Y|ROTLIKE_Z; - } + break; + } } } } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 25d3f4f0dfb..e03db11e71b 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -613,8 +613,9 @@ static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers) /* write coefficients array */ if (data->coefficients) writedata(wd, DATA, sizeof(float)*(data->arraysize), data->coefficients); - } + break; + } case FMODIFIER_TYPE_ENVELOPE: { FMod_Envelope *data= (FMod_Envelope *)fcm->data; @@ -622,8 +623,9 @@ static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers) /* write envelope data */ if (data->data) writestruct(wd, DATA, "FCM_EnvelopeData", data->totvert, data->data); - } + break; + } case FMODIFIER_TYPE_PYTHON: { FMod_Python *data = (FMod_Python *)fcm->data; @@ -631,8 +633,9 @@ static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers) /* Write ID Properties -- and copy this comment EXACTLY for easy finding * of library blocks that implement this.*/ IDP_WriteProperty(data->prop, wd); - } + break; + } } } } @@ -1425,16 +1428,18 @@ static void write_constraints(WriteData *wd, ListBase *conlist) /* Write ID Properties -- and copy this comment EXACTLY for easy finding * of library blocks that implement this.*/ IDP_WriteProperty(data->prop, wd); - } + break; + } case CONSTRAINT_TYPE_SPLINEIK: { bSplineIKConstraint *data = (bSplineIKConstraint *)con->data; /* write points array */ writedata(wd, DATA, sizeof(float)*(data->numpoints), data->points); - } + break; + } } } -- cgit v1.2.3