diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 04:36:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 04:36:50 +0400 |
commit | 857dedbc584fcf0af0afa13f008377fd9a83dad1 (patch) | |
tree | 1a6d3fa834658422032f4de3140472b82a8cbfa6 /source/blender | |
parent | 822362189badefd6c0014f608d36d98e8ab57282 (diff) |
style cleanup
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/noise.c | 9 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 11 |
6 files changed, 19 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index fac74d27e0d..915f5557925 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -58,8 +58,7 @@ #include "RNA_access.h" /* **** XXX **** */ -static void error(const char *UNUSED(error), ...) { -} +static void error(const char *UNUSED(error), ...) {} #define INT 96 #define FLO 128 diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index cad4addc87b..e01d2061743 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -1134,15 +1134,18 @@ static float turbulencep(float noisesize, float x, float y, float z, int nr) /* Camberra omitted, didn't seem useful */ /* distance squared */ -static float dist_Squared(float x, float y, float z, float e) { +static float dist_Squared(float x, float y, float z, float e) +{ (void)e; return (x * x + y * y + z * z); } /* real distance */ -static float dist_Real(float x, float y, float z, float e) { +static float dist_Real(float x, float y, float z, float e) +{ (void)e; return sqrtf(x * x + y * y + z * z); } /* manhattan/taxicab/cityblock distance */ -static float dist_Manhattan(float x, float y, float z, float e) { +static float dist_Manhattan(float x, float y, float z, float e) +{ (void)e; return (fabsf(x) + fabsf(y) + fabsf(z)); } /* Chebychev */ diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 8ea66934a31..856743d9997 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -4226,8 +4226,8 @@ static int armature_select_similar_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ARMATURE_OT_select_similar(wmOperatorType *ot) { - +void ARMATURE_OT_select_similar(wmOperatorType *ot) +{ /* identifiers */ ot->name = "Select Similar"; ot->idname = "ARMATURE_OT_select_similar"; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 107b19b0ed7..de0ca05b0ad 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -109,8 +109,7 @@ static void waitcursor(int UNUSED(val)) {} static int pupmenu(const char *UNUSED(msg)) {return 0;} /* port over here */ -static void error_libdata(void) { -} +static void error_libdata(void) {} Object *ED_object_context(bContext *C) { diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index db75198bcd4..e1c90c27789 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -2186,7 +2186,8 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE uiItemR(row, ptr, "midtones_end", UI_ITEM_R_SLIDER, NULL, ICON_NONE); } -static void node_composit_buts_colorcorrection_but(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { +static void node_composit_buts_colorcorrection_but(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +{ uiLayout *row; row = uiLayoutRow(layout, 0); diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index c5b637eea5b..45d2d16d794 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -120,14 +120,17 @@ int ismovie(const char *UNUSED(filepath)) } /* never called, just keep the linker happy */ -static int startmovie(struct anim *UNUSED(anim)) { +static int startmovie(struct anim *UNUSED(anim)) +{ return 1; } -static ImBuf *movie_fetchibuf(struct anim *UNUSED(anim), int UNUSED(position)) { +static ImBuf *movie_fetchibuf(struct anim *UNUSED(anim), int UNUSED(position)) +{ return NULL; } -static void free_anim_movie(struct anim *UNUSED(anim)) { - ; +static void free_anim_movie(struct anim *UNUSED(anim)) +{ + /* pass */ } |