archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup: imbuf & icons

Browse Source
This commit is contained in:
Campbell Barton
2012-05-13 22:05:51 +00:00
parent e5963aae1d
commit 4f2c83f573
10 changed files with 630 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@@ -216,7 +216,7 @@ test_deprecated:
test_style:
# run our own checks on C/C++ style
PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator
PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
# -----------------------------------------------------------------------------
# Project Files

2
source/blender/blenkernel/intern/CCGSubSurf.c
View File

@@ -2406,7 +2406,7 @@ static void ccgSubSurf__allFaces(CCGSubSurf *ss, CCGFace ***faces, int *numFaces
CCGFace **array;
int i, num;
if (!*faces) {
if (*faces == NULL) {
array = MEM_mallocN(sizeof(*array) * ss->fMap->numEntries, "CCGSubsurf allFaces");
num = 0;
for (i = 0; i < ss->fMap->curSize; i++) {

6
source/blender/blenkernel/intern/icons.c
View File

@@ -51,8 +51,6 @@
#include "BLO_sys_types.h" // for intptr_t support
#define GS(a) (*((short *)(a)))
/* GLOBALS */
static GHash *gIcons = NULL;
@@ -115,7 +113,7 @@ void BKE_icons_free(void)
gIcons = NULL;
}
struct PreviewImage* BKE_previewimg_create(void)
PreviewImage *BKE_previewimg_create(void)
{
PreviewImage *prv_img = NULL;
int i;
@@ -153,7 +151,7 @@ void BKE_previewimg_free(PreviewImage **prv)
}
}
struct PreviewImage* BKE_previewimg_copy(PreviewImage *prv)
PreviewImage *BKE_previewimg_copy(PreviewImage *prv)
{
PreviewImage *prv_img = NULL;
int i;

3
source/blender/imbuf/intern/filter.c
View File

@@ -400,7 +400,8 @@ void IMB_filter_extend(struct ImBuf *ibuf, char *mask, int filter)
if (check_pixel_assigned(srcbuf, srcmask, filter_make_index(x - 1, y, width, height), depth, is_float) ||
check_pixel_assigned(srcbuf, srcmask, filter_make_index(x + 1, y, width, height), depth, is_float) ||
check_pixel_assigned(srcbuf, srcmask, filter_make_index(x, y - 1, width, height), depth, is_float) ||
check_pixel_assigned(srcbuf, srcmask, filter_make_index(x, y+1, width, height), depth, is_float)) {
check_pixel_assigned(srcbuf, srcmask, filter_make_index(x, y + 1, width, height), depth, is_float))
{
for (i = -n; i <= n; i++) {
for (j = -n; j <= n; j++) {
if (i != 0 || j != 0) {