diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-19 12:34:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-19 12:34:02 +0300 |
| commit | 52d72a37cd85dc8c23482d4102abb86645a221bb (patch) | |
| tree | cbeb3e85d526779c2099043d2c2db1499f0057fd /source/blender | |
| parent | ad95cb72bc6e76a2b3dc0996293bfb8379084e38 (diff) | |
Cleanup
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/object/object_shapekey.c | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/bmp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index fb9687da6df..fb0b2ed231c 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -127,8 +127,8 @@ static bool ED_object_shape_key_remove(Main *bmain, Object *ob) } else if (rkb->relative >= ob->shapenr) { /* Fix positional shift of the keys when kb is deleted from the list */ - rkb->relative -= 1; - } + rkb->relative -= 1; + } } BLI_remlink(&key->block, kb); diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index 19e655a0b3d..298e2da965f 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -136,7 +136,7 @@ struct ImBuf *imb_bmp_decode(unsigned char *mem, size_t size, int flags, char co colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_BYTE); - bmp = mem + LITTLE_LONG(*(int*)(mem + 10)); + bmp = mem + LITTLE_LONG(*(int *)(mem + 10)); if (CHECK_HEADER_FIELD_BMP(mem)) { /* skip fileheader */ |