[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52714] trunk/blender: Silent some warnings (the one in bmesh_operator. c was even preventing build in -Werror mode).

[Bastien Montagne]

Revision: 52714
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52714
Author:   mont29
Date:     2012-12-02 13:35:33 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Silent some warnings (the one in bmesh_operator.c was even preventing build in -Werror mode).

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
    trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
    trunk/blender/source/blender/collada/TransformReader.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp	2012-12-02 09:54:44 UTC (rev 52713)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp	2012-12-02 13:35:33 UTC (rev 52714)
@@ -90,8 +90,8 @@
 				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);

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2012-12-02 09:54:44 UTC (rev 52713)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2012-12-02 13:35:33 UTC (rev 52714)
@@ -256,7 +256,7 @@
 	if (UNLIKELY(slot_code < 0)) {
 		//return &BMOpEmptySlot;
 		BLI_assert(0);
-		NULL;  /* better crash */
+		(void) NULL;  /* better crash */
 	}
 
 	return &slot_args[slot_code];

Modified: trunk/blender/source/blender/collada/TransformReader.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformReader.cpp	2012-12-02 09:54:44 UTC (rev 52713)
+++ trunk/blender/source/blender/collada/TransformReader.cpp	2012-12-02 13:35:33 UTC (rev 52714)
@@ -84,7 +84,7 @@
 	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);