diff options
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManagerX11.cpp | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.c | 2 | ||||
| -rw-r--r-- | source/blender/collada/TransformReader.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp index 49e7def8730..468a37de633 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp +++ b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp @@ -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); diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index ba38f230f0b..baec0b7745d 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -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]; diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp index d10cd7378e9..61793589422 100644 --- a/source/blender/collada/TransformReader.cpp +++ b/source/blender/collada/TransformReader.cpp @@ -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); |