Merge remote-tracking branch 'refs/remotes/GarageGames/development' into development

engine/source/2d/sceneobject/SceneObject_ScriptBinding.h

@@ -2065,7 +2065,7 @@ ConsoleMethodWithDocs(SceneObject, growTo, ConsoleBool, 4, 4, (targetSize width
 	}
 
 	Vector2 rate;
-	const U32 rateCount = Utility::mGetStringElementCount(argv[2]);
+	const U32 rateCount = Utility::mGetStringElementCount(argv[3]);
 	if (rateCount == 1)
 	{
 		rate.x = dAtof(Utility::mGetStringElement(argv[3], 0));

engine/source/platform/types.h

@@ -170,6 +170,11 @@ inline U32 endianSwap(const U32 in_swap)
 #define Offset(x, cls) _Offset_Normal(x, cls)
 #define OffsetNonConst(x, cls) _Offset_Variant_1(x, cls)
 
+#elif defined(TORQUE_COMPILER_GCC) && (__GNUC__ == 5)
+#include <stddef.h>
+#define Offset(x, cls) offsetof(cls, x)
+#define OffsetNonConst(x, cls) _Offset_Normal(x, cls)
+
 #endif
 #endif