diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-19 20:38:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-19 20:40:10 +0400 |
commit | 1ea47c9af9bf707d7ddb36c88425636ac35e0fc8 (patch) | |
tree | 0439da09aa8ee0417a89240b45fa569ffa8899e0 /source | |
parent | 780459e40646e99b555fee7062ace7386dc845fd (diff) |
Code Cleanup: style, spelling and pep8 edits
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bmfont.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mask.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 5a283922707..f28d16427cf 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -147,14 +147,14 @@ void *CustomData_add_layer_named(struct CustomData *data, int type, int alloctyp void *layer, int totelem, const char *name); /* frees the active or first data layer with the give type. - * returns 1 on succes, 0 if no layer with the given type is found + * returns 1 on success, 0 if no layer with the given type is found * * in editmode, use EDBM_data_layer_free instead of this function */ bool CustomData_free_layer(struct CustomData *data, int type, int totelem, int index); /* frees the layer index with the give type. - * returns 1 on succes, 0 if no layer with the given type is found + * returns 1 on success, 0 if no layer with the given type is found * * in editmode, use EDBM_data_layer_free instead of this function */ diff --git a/source/blender/blenkernel/intern/bmfont.c b/source/blender/blenkernel/intern/bmfont.c index 2d7249b54f5..732c0c35feb 100644 --- a/source/blender/blenkernel/intern/bmfont.c +++ b/source/blender/blenkernel/intern/bmfont.c @@ -204,7 +204,7 @@ void detectBitmapFont(ImBuf *ibuf) printf("detectBitmapFont :Unsupported version %d\n", (int)version); } - /* on succes ibuf->userdata points to the bitmapfont */ + /* on success ibuf->userdata points to the bitmapfont */ if (ibuf->userdata) { break; } diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 6ee097b066f..83b100db1b2 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3242,7 +3242,8 @@ int autocomplete_end(AutoComplete *autocpl, char *autoname) if (autocpl->truncate[0]) { if (autocpl->matches == 1) { match = AUTOCOMPLETE_FULL_MATCH; - } else { + } + else { match = AUTOCOMPLETE_PARTIAL_MATCH; } BLI_strncpy(autoname, autocpl->truncate, autocpl->maxlen); diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 6d04b9b8826..373e57d5708 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -218,7 +218,7 @@ typedef struct FlyInfo { short persp_backup; /* remember if were ortho or not, only used for restoring the view if it was a ortho view */ /* are we flying an ortho camera in perspective view, - * which was originall in ortho view? + * which was originally in ortho view? * could probably figure it out but better be explicit */ bool is_ortho_cam; void *obtfm; /* backup the objects transform */ diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index 2822cf6925b..839e30d9c1a 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -172,7 +172,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } /* if no dverts (i.e. no data for vertex groups exists), we've got an - * inconsistent situation, so free hashes and return oirginal mesh + * inconsistent situation, so free hashes and return original mesh */ dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); if (dvert == NULL) { |