diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-10-01 20:40:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-01 20:40:11 +0400 |
commit | 4627f9d92cb8c79456ed56aff6cf4a1153f645f4 (patch) | |
tree | ea413ca6c64947c7258933b429a5154458fb942e | |
parent | d2e55cb28253b6085212d962a60567ef3d542c18 (diff) |
style edits and use macro for prefix check
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/texture.c | 6 | ||||
-rw-r--r-- | source/blender/editors/screen/screendump.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_uv.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index b2ce6eef29a..74578266c63 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -774,7 +774,7 @@ static void fcurves_path_remove_fix(const char *prefix, ListBase *curves) fcn = fcu->next; if (fcu->rna_path) { - if (strncmp(prefix, fcu->rna_path, strlen(prefix)) == 0) { + if (STRPREFIX(fcu->rna_path, prefix)) { BLI_remlink(curves, fcu); free_fcurve(fcu); } diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 6c2fe2daac7..22b0fe7bc24 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -124,11 +124,11 @@ void init_tex_mapping(TexMapping *texmap) if (ELEM(texmap->type, TEXMAP_TYPE_TEXTURE, TEXMAP_TYPE_NORMAL)) { /* keep matrix invertible */ if (fabsf(size[0]) < 1e-5f) - size[0] = signf(size[0])*1e-5f; + size[0] = signf(size[0]) * 1e-5f; if (fabsf(size[1]) < 1e-5f) - size[1] = signf(size[1])*1e-5f; + size[1] = signf(size[1]) * 1e-5f; if (fabsf(size[2]) < 1e-5f) - size[2] = signf(size[2])*1e-5f; + size[2] = signf(size[2]) * 1e-5f; } size_to_mat4(smat, texmap->size); diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 40447a0106a..dbe1197436b 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -85,7 +85,7 @@ static void screenshot_read_pixels(int x, int y, int w, int h, unsigned char *re glFinish(); /* clear alpha, it is not set to a meaningful value in opengl */ - for (i = 0, rect += 3; i < w*h; i++, rect += 4) + for (i = 0, rect += 3; i < w * h; i++, rect += 4) *rect = 255; } @@ -327,7 +327,7 @@ static void screenshot_updatejob(void *sjv) if (sj->dumprect == NULL) { dumprect = MEM_mallocN(sizeof(int) * sj->dumpsx * sj->dumpsy, "dumprect"); - screenshot_read_pixels(sj->x, sj->y, sj->dumpsx, sj->dumpsy, (unsigned char*)dumprect); + screenshot_read_pixels(sj->x, sj->y, sj->dumpsx, sj->dumpsy, (unsigned char *)dumprect); sj->dumprect = dumprect; } diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 6401842f43e..7a973d8c1ae 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -539,7 +539,7 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, const wm op->customdata = data; - curvemapping_initialize (ts->uvsculpt->paint.brush->curve); + curvemapping_initialize(ts->uvsculpt->paint.brush->curve); if (data) { int counter = 0, i; |