From afe3b55483d5f0cbaccc7fb3974ac2e5cbdfffbe Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 Oct 2015 22:22:30 +1100 Subject: Cleanup: warning & whitespace --- source/blender/blenkernel/intern/packedFile.c | 2 -- source/blender/blenkernel/intern/softbody.c | 7 ------- source/blender/blenlib/intern/BLI_args.c | 2 -- source/blender/blenlib/intern/BLI_kdopbvh.c | 2 -- source/blender/bmesh/intern/bmesh_operators.c | 2 -- source/blender/bmesh/operators/bmo_connect_nonplanar.c | 2 -- source/blender/collada/AnimationExporter.cpp | 2 -- source/blender/collada/AnimationImporter.cpp | 2 -- source/blender/compositor/operations/COM_BoxMaskOperation.cpp | 3 --- source/blender/compositor/operations/COM_ColorRampOperation.h | 2 -- source/blender/compositor/operations/COM_EllipseMaskOperation.cpp | 2 -- source/blender/compositor/operations/COM_TonemapOperation.h | 2 -- source/blender/editors/gpencil/gpencil_intern.h | 4 ---- source/blender/editors/space_graph/graph_ops.c | 1 - source/blender/windowmanager/wm_cursors.h | 3 --- 15 files changed, 38 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index a1669c745e6..1c318dfd115 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -262,8 +262,6 @@ void packAll(Main *bmain, ReportList *reports, bool verbose) BKE_reportf(reports, RPT_INFO, "Packed %d files", tot); else if (verbose) BKE_report(reports, RPT_INFO, "No new files have been packed"); - - } diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index dac395645c9..880a47b3256 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -272,7 +272,6 @@ typedef struct ccdf_minmax { } ccdf_minmax; - typedef struct ccd_Mesh { int mvert_num, tri_num; const MVert *mvert; @@ -286,8 +285,6 @@ typedef struct ccd_Mesh { } ccd_Mesh; - - static ccd_Mesh *ccd_mesh_make(Object *ob) { CollisionModifierData *cmd; @@ -561,8 +558,6 @@ static void ccd_update_deflector_hash(Scene *scene, Object *vertexowner, GHash * } - - /*--- collider caching and dicing ---*/ @@ -2254,8 +2249,6 @@ static void softbody_calc_forcesEx(Scene *scene, Object *ob, float forcetime, fl } - - static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, float timenow, int nl_flags) { /* redirection to the new threaded Version */ diff --git a/source/blender/blenlib/intern/BLI_args.c b/source/blender/blenlib/intern/BLI_args.c index 9faf6c93447..340ae52120c 100644 --- a/source/blender/blenlib/intern/BLI_args.c +++ b/source/blender/blenlib/intern/BLI_args.c @@ -213,8 +213,6 @@ void BLI_argsAddCase(struct bArgs *ba, int pass, if (long_arg) internalAdd(ba, long_arg, pass, long_case, cb, data, d); - - } void BLI_argsAdd(struct bArgs *ba, int pass, diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index ddb61e415ac..18df2a598de 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -1789,8 +1789,6 @@ typedef struct RangeQueryData { BVHTree_RangeQuery callback; void *userdata; - - } RangeQueryData; diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index e65f3e38900..48bdc324e69 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -1266,8 +1266,6 @@ static void bmo_flag_layer_alloc(BMesh *bm) BLI_mempool_destroy(foldpool); bm->elem_index_dirty &= ~(BM_VERT | BM_EDGE | BM_FACE); - - } static void bmo_flag_layer_free(BMesh *bm) diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.c b/source/blender/bmesh/operators/bmo_connect_nonplanar.c index c9ce2c5f6b8..c80fb95c44a 100644 --- a/source/blender/bmesh/operators/bmo_connect_nonplanar.c +++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.c @@ -120,8 +120,6 @@ static bool bm_face_split_find(BMesh *bm, BMFace *f, BMLoop *l_pair[2], float *r *r_angle = angle_best; return found; - - } static bool bm_face_split_by_angle(BMesh *bm, BMFace *f, BMFace *r_f_pair[2], const float angle_limit) diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 7bea0b70c95..3bff20e846b 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -142,8 +142,6 @@ void AnimationExporter::operator()(Object *ob) } } } - - } void AnimationExporter::export_object_constraint_animation(Object *ob) diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 1bcf51f9d1f..5cd01eff263 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -626,8 +626,6 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& list fcurve_is_used(fcu); } } - - } void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, const char *anim_type) diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.cpp b/source/blender/compositor/operations/COM_BoxMaskOperation.cpp index 4e956905311..c4765b849bf 100644 --- a/source/blender/compositor/operations/COM_BoxMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_BoxMaskOperation.cpp @@ -107,8 +107,6 @@ void BoxMaskOperation::executePixelSampled(float output[4], float x, float y, Pi } break; } - - } void BoxMaskOperation::deinitExecution() @@ -116,4 +114,3 @@ void BoxMaskOperation::deinitExecution() this->m_inputMask = NULL; this->m_inputValue = NULL; } - diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.h b/source/blender/compositor/operations/COM_ColorRampOperation.h index 333e6c36d97..f143e1568d5 100644 --- a/source/blender/compositor/operations/COM_ColorRampOperation.h +++ b/source/blender/compositor/operations/COM_ColorRampOperation.h @@ -53,7 +53,5 @@ public: void setColorBand(ColorBand *colorBand) { this->m_colorBand = colorBand; } - - }; #endif diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp index bc1a6848a57..49c4662ed0c 100644 --- a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp @@ -111,8 +111,6 @@ void EllipseMaskOperation::executePixelSampled(float output[4], float x, float y } break; } - - } void EllipseMaskOperation::deinitExecution() diff --git a/source/blender/compositor/operations/COM_TonemapOperation.h b/source/blender/compositor/operations/COM_TonemapOperation.h index 843bf89dc92..9b6858cdaf1 100644 --- a/source/blender/compositor/operations/COM_TonemapOperation.h +++ b/source/blender/compositor/operations/COM_TonemapOperation.h @@ -82,8 +82,6 @@ public: void setData(NodeTonemap *data) { this->m_data = data; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - - }; /** diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 290935a06cf..9c0b6f785d1 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -203,8 +203,4 @@ typedef enum ACTCONT_TYPES { ACTCONT_GPENCIL } ACTCONT_TYPES; - - - #endif /* __GPENCIL_INTERN_H__ */ - diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 397a884e20a..59215531ac0 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -133,7 +133,6 @@ static int graphview_cursor_exec(bContext *C, wmOperator *op) /* set the operator properties from the initial event */ static void graphview_cursor_setprops(bContext *C, wmOperator *op, const wmEvent *event) { - Scene *scene = CTX_data_scene(C); ARegion *ar = CTX_wm_region(C); float viewx, viewy; diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h index 4c07324184d..81adf3a7769 100644 --- a/source/blender/windowmanager/wm_cursors.h +++ b/source/blender/windowmanager/wm_cursors.h @@ -29,9 +29,6 @@ * \ingroup wm */ - - - #ifndef __WM_CURSORS_H__ #define __WM_CURSORS_H__ -- cgit v1.2.3