From 99299da4b5ca1f9e9c347db120dc93df58e8d0a6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 16 Apr 2015 01:12:22 +1000 Subject: [PATCH] Cleanup: warnings, ws --- source/blender/blenkernel/BKE_sequencer.h | 2 +- source/blender/bmesh/intern/bmesh_operator_api.h | 3 --- source/blender/collada/AnimationExporter.h | 4 ++-- source/blender/makesdna/DNA_object_force.h | 2 +- source/gameengine/Ketsji/KX_PyConstraintBinding.cpp | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 4a45489933c..f73548373ef 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -296,7 +296,7 @@ int BKE_sequence_effect_get_supports_mask(int seq_type); * Sequencer editing functions * ********************************************************************** */ - + /* for transform but also could use elsewhere */ int BKE_sequence_tx_get_final_left(struct Sequence *seq, bool metaclip); int BKE_sequence_tx_get_final_right(struct Sequence *seq, bool metaclip); diff --git a/source/blender/bmesh/intern/bmesh_operator_api.h b/source/blender/bmesh/intern/bmesh_operator_api.h index d966d882c67..33a956b652f 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api.h +++ b/source/blender/bmesh/intern/bmesh_operator_api.h @@ -483,9 +483,6 @@ bool BMO_iter_map_value_bool(BMOIter *iter); ele; \ BM_CHECK_TYPE_ELEM_ASSIGN(ele) = BMO_iter_step(iter)) -/******************* Inlined Functions********************/ -typedef void (*opexec)(BMesh *bm, BMOperator *op); - extern const int BMO_OPSLOT_TYPEINFO[BMO_OP_SLOT_TOTAL_TYPES]; int BMO_opcode_from_opname(const char *opname); diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index 6f675ed6a39..4736361ad13 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -103,7 +103,7 @@ protected: const ExportSettings *export_settings; void dae_animation(Object *ob, FCurve *fcu, char *transformName, bool is_param, Material *ma = NULL); - + void export_object_constraint_animation(Object *ob); void export_morph_animation(Object *ob); @@ -154,7 +154,7 @@ protected: std::string create_xyz_source(float *v, int tot, const std::string& anim_id); std::string create_4x4_source(std::vector &frames, Object * ob_arm, Bone *bone, const std::string& anim_id); - + std::string create_interpolation_source(FCurve *fcu, const std::string& anim_id, const char *axis_name, bool *has_tangents); std::string fake_interpolation_source(int tot, const std::string& anim_id, const char *axis_name); diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 5cc56d861a3..c9c1f618e86 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -297,7 +297,7 @@ typedef struct SoftBody { char namedVG_Softgoal[64]; /* MAX_VGROUP_NAME */ /* starting to fix old bug .. nastiness that VG are indexes * rather find them by name tag to find it -> jow20090613 */ - + short fuzzyness; /* */ /* springs */ diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp index 77453916e44..065251f5676 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp @@ -497,7 +497,6 @@ static PyObject *gPyCreateConstraint(PyObject *self, /* FIXME - physicsid is a long being cast to a pointer, should at least use PyCapsule */ unsigned long long physicsid = 0, physicsid2 = 0; int constrainttype = 0; - int len = PyTuple_Size(args); int flag = 0; float pivotX = 0.0f, pivotY = 0.0f, pivotZ = 0.0f, axisX = 0.0f, axisY = 0.0f, axisZ = 0.0f;