Merge branch 'vs2012-fixes' of https://github.com/eightyeight/Torque3D into eightyeight-vs2012-fixes

Engine/source/platform/types.visualc.h

@@ -88,7 +88,9 @@ typedef unsigned _int64 U64;
 #  define FN_CDECL __cdecl            ///< Calling convention
 #endif
 
+#if _MSC_VER < 1700
 #define for if(false) {} else for   ///< Hack to work around Microsoft VC's non-C++ compliance on variable scoping
+#endif
 
 // disable warning caused by memory layer
 // see msdn.microsoft.com "Compiler Warning (level 1) C4291" for more details

Engine/source/platform/typesWin32.h

@@ -116,8 +116,10 @@ static const F32 F32_MAX = F32(3.402823466e+38F);                 ///< Constant
 
 
 #ifdef _MSC_VER
+#if _MSC_VER < 1700
 #define for if(false) {} else for   ///< Hack to work around Microsoft VC's non-C++ compliance on variable scoping
 #endif
+#endif
 
 
 #endif //_NTYPES_H_