Commit: afe3b55483d5f0cbaccc7fb3974ac2e5cbdfffbe
Author: Campbell Barton
Date: Mon Oct 26 22:22:30 2015 +1100
Branches: master
https://developer.blender.org/rBafe3b55483d5f0cbaccc7fb3974ac2e5cbdfffbe
Cleanup: warning & whitespace
===================================================================
M source/blender/blenkernel/intern/packedFile.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/BLI_args.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/bmesh/operators/bmo_connect_nonplanar.c
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/AnimationImporter.cpp
M source/blender/compositor/operations/COM_BoxMaskOperation.cpp
M source/blender/compositor/operations/COM_ColorRampOperation.h
M source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
M source/blender/compositor/operations/COM_TonemapOperation.h
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/space_graph/graph_ops.c
M source/blender/windowmanager/wm_cursors.h
M source/gameengine/GameLogic/SCA_DelaySensor.h
===================================================================
diff --git a/source/blender/blenkernel/intern/packedFile.c
b/source/blender/blenkernel/intern/packedFile.c
index a1669c7..1c318df 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 dac3956..880a47b 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 9faf6c9..340ae52 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 ddb61e4..18df2a5 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 e65f3e3..48bdc32 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 c9ce2c5..c80fb95 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 7bea0b7..3bff20e 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 1bcf51f..5cd01ef 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 4e95690..c4765b8 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 333e6c3..f143e15 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 bc1a684..49c4662 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 843bf89..9b6858c 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 290935a..9c0b6f7 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 397a884..5921553 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 4c07324..81adf3a 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__
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.h
b/source/gameengine/GameLogic/SCA_DelaySensor.h
index b516cd8..9b39de7 100644
--- a/source/gameengine/GameLogic/SCA_DelaySensor.h
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.h
@@ -61,8 +61,6 @@ public:
/*
--------------------------------------------------------------------- */
/* Python interface
---------------------------------------------------- */
/*
--------------------------------------------------------------------- */
-
-
};
#endif /* __SCA_DELAYSENSOR_H__ */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
