Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: warnings, ws

Browse Source
This commit is contained in:
Campbell Barton
2015-04-16 01:12:22 +10:00
parent 34c1319d06
commit 99299da4b5
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_sequencer.h
View File

@@ -296,7 +296,7 @@ int BKE_sequence_effect_get_supports_mask(int seq_type);
* Sequencer editing functions * Sequencer editing functions
* ********************************************************************** * **********************************************************************
*/ */
/* for transform but also could use elsewhere */ /* 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_left(struct Sequence *seq, bool metaclip);
int BKE_sequence_tx_get_final_right(struct Sequence *seq, bool metaclip); int BKE_sequence_tx_get_final_right(struct Sequence *seq, bool metaclip);

3
source/blender/bmesh/intern/bmesh_operator_api.h
View File

@@ -483,9 +483,6 @@ bool BMO_iter_map_value_bool(BMOIter *iter);
ele; \ ele; \
BM_CHECK_TYPE_ELEM_ASSIGN(ele) = BMO_iter_step(iter)) 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]; extern const int BMO_OPSLOT_TYPEINFO[BMO_OP_SLOT_TOTAL_TYPES];
int BMO_opcode_from_opname(const char *opname); int BMO_opcode_from_opname(const char *opname);

4
source/blender/collada/AnimationExporter.h
View File

@@ -103,7 +103,7 @@ protected:
const ExportSettings *export_settings; const ExportSettings *export_settings;
void dae_animation(Object *ob, FCurve *fcu, char *transformName, bool is_param, Material *ma = NULL); void dae_animation(Object *ob, FCurve *fcu, char *transformName, bool is_param, Material *ma = NULL);
void export_object_constraint_animation(Object *ob); void export_object_constraint_animation(Object *ob);
void export_morph_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_xyz_source(float *v, int tot, const std::string& anim_id);
std::string create_4x4_source(std::vector<float> &frames, Object * ob_arm, Bone *bone, const std::string& anim_id); std::string create_4x4_source(std::vector<float> &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 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); std::string fake_interpolation_source(int tot, const std::string& anim_id, const char *axis_name);

2
source/blender/makesdna/DNA_object_force.h
View File

@@ -297,7 +297,7 @@ typedef struct SoftBody {
char namedVG_Softgoal[64]; /* MAX_VGROUP_NAME */ char namedVG_Softgoal[64]; /* MAX_VGROUP_NAME */
/* starting to fix old bug .. nastiness that VG are indexes /* starting to fix old bug .. nastiness that VG are indexes
* rather find them by name tag to find it -> jow20090613 */ * rather find them by name tag to find it -> jow20090613 */
short fuzzyness; /* */ short fuzzyness; /* */
/* springs */ /* springs */

1
source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
View File

@@ -497,7 +497,6 @@ static PyObject *gPyCreateConstraint(PyObject *self,
/* FIXME - physicsid is a long being cast to a pointer, should at least use PyCapsule */ /* FIXME - physicsid is a long being cast to a pointer, should at least use PyCapsule */
unsigned long long physicsid = 0, physicsid2 = 0; unsigned long long physicsid = 0, physicsid2 = 0;
int constrainttype = 0; int constrainttype = 0;
int len = PyTuple_Size(args);
int flag = 0; int flag = 0;
float pivotX = 0.0f, pivotY = 0.0f, pivotZ = 0.0f, axisX = 0.0f, axisY = 0.0f, axisZ = 0.0f; float pivotX = 0.0f, pivotY = 0.0f, pivotZ = 0.0f, axisX = 0.0f, axisY = 0.0f, axisZ = 0.0f;