merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though...
[blender-staging.git] / source / gameengine / Converter / BL_BlenderDataConversion.cpp
index 3016ac62a63db6bdc8023af6978aeb6ee3b7f284..57e576f84b8d28ce1c9e3209aa62b1fc4ed02d50 100644 (file)
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
@@ -2584,13 +2584,11 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 
                                                if (gameobj->GetPhysicsController())
                                                {
-                                                       float radsPerDeg = 6.283185307179586232f / 360.f;
-
                                                        PHY_IPhysicsController* physctrl = (PHY_IPhysicsController*) gameobj->GetPhysicsController()->GetUserData();
                                                        //we need to pass a full constraint frame, not just axis
                                    
                                                        //localConstraintFrameBasis
-                                                       MT_Matrix3x3 localCFrame(MT_Vector3(radsPerDeg*dat->axX,radsPerDeg*dat->axY,radsPerDeg*dat->axZ));
+                                                       MT_Matrix3x3 localCFrame(MT_Vector3(dat->axX,dat->axY,dat->axZ));
                                                        MT_Vector3 axis0 = localCFrame.getColumn(0);
                                                        MT_Vector3 axis1 = localCFrame.getColumn(1);
                                                        MT_Vector3 axis2 = localCFrame.getColumn(2);