sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Silent some warnings (the one in bmesh_operator.c was even preventing build in -Werror mode).

Browse Source
This commit is contained in:
Bastien Montagne 2012-12-02 13:35:33 +00:00
parent 3d6bc1e1f4
commit 1d09d0a9c5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_NDOFManagerX11.cpp
View File

@ -90,8 +90,8 @@ bool GHOST_NDOFManagerX11::processEvents()
case SPNAV_EVENT_MOTION:
{
/* convert to blender view coords */
short t[3] = {e.motion.x, e.motion.y, -e.motion.z};
short r[3] = {-e.motion.rx, -e.motion.ry, e.motion.rz};
short t[3] = {(short)e.motion.x, (short)e.motion.y, (short)-e.motion.z};
short r[3] = {(short)-e.motion.rx, (short)-e.motion.ry, (short)e.motion.rz};
updateTranslation(t, now);
updateRotation(r, now);

2
source/blender/bmesh/intern/bmesh_operators.c
View File

@ -256,7 +256,7 @@ BMOpSlot *BMO_slot_get(BMOpSlot slot_args[BMO_OP_MAX_SLOTS], const char *identif
if (UNLIKELY(slot_code < 0)) {
//return &BMOpEmptySlot;
BLI_assert(0);
NULL; /* better crash */
return NULL; /* better crash */
}
return &slot_args[slot_code];

2
source/blender/collada/TransformReader.cpp
View File

@ -84,7 +84,7 @@ void TransformReader::dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[
COLLADAFW::Rotate *ro = (COLLADAFW::Rotate *)tm;
COLLADABU::Math::Vector3& axis = ro->getRotationAxis();
const float angle = (float)DEG2RAD(ro->getRotationAngle());
const float ax[] = {axis[0], axis[1], axis[2]};
const float ax[] = {(float)axis[0], (float)axis[1], (float)axis[2]};
// float quat[4];
// axis_angle_to_quat(quat, axis, angle);
// quat_to_mat4(m, quat);