Commit: 52d72a37cd85dc8c23482d4102abb86645a221bb
Author: Campbell Barton
Date: Thu Mar 19 20:34:02 2015 +1100
Branches: master
https://developer.blender.org/rB52d72a37cd85dc8c23482d4102abb86645a221bb
Cleanup
===================================================================
M build_files/cmake/Modules/FindPCRE.cmake
M source/blender/editors/object/object_shapekey.c
M source/blender/imbuf/intern/bmp.c
===================================================================
diff --git a/build_files/cmake/Modules/FindPCRE.cmake
b/build_files/cmake/Modules/FindPCRE.cmake
index 9d73e92..ff4b726 100644
--- a/build_files/cmake/Modules/FindPCRE.cmake
+++ b/build_files/cmake/Modules/FindPCRE.cmake
@@ -40,7 +40,6 @@ FIND_PATH(PCRE_INCLUDE_DIR pcre.h
${_pcre_SEARCH_DIRS}
PATH_SUFFIXES
include
- include
)
FIND_LIBRARY(PCRE_LIBRARY
diff --git a/source/blender/editors/object/object_shapekey.c
b/source/blender/editors/object/object_shapekey.c
index fb9687d..fb0b2ed 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 19e655a..298e2da 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
