bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Campbell Barton 2015-03-19 20:34:02 +11:00
parent ad95cb72bc
commit 52d72a37cd
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/cmake/Modules/FindPCRE.cmake
View File

@ -40,7 +40,6 @@ FIND_PATH(PCRE_INCLUDE_DIR pcre.h
${_pcre_SEARCH_DIRS}
PATH_SUFFIXES
include
include
)
FIND_LIBRARY(PCRE_LIBRARY

4
source/blender/editors/object/object_shapekey.c
View File

@ -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);

2
source/blender/imbuf/intern/bmp.c
View File

@ -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 */