Index: ps/trunk/libraries/osx/build-osx-libs.sh
===================================================================
--- ps/trunk/libraries/osx/build-osx-libs.sh
+++ ps/trunk/libraries/osx/build-osx-libs.sh
@@ -54,7 +54,7 @@
 # --------------------------------------------------------------
 # We use suffixes here in order to force rebuilding when patching these libs
 NVTT_VERSION="nvtt-2.1.1+wildfiregames.1"
-FCOLLADA_VERSION="fcollada-3.05+wildfiregames.1"
+FCOLLADA_VERSION="fcollada-3.05+wildfiregames.2"
 # --------------------------------------------------------------
 # Provided by OS X:
 # * OpenAL
Index: ps/trunk/libraries/source/fcollada/src/FCollada/FMath/FMAllocator.cpp
===================================================================
--- ps/trunk/libraries/source/fcollada/src/FCollada/FMath/FMAllocator.cpp
+++ ps/trunk/libraries/source/fcollada/src/FCollada/FMath/FMAllocator.cpp
@@ -1,36 +1,37 @@
-/*
-	Copyright (C) 2005-2007 Feeling Software Inc.
-	Portions of the code are:
-	Copyright (C) 2005-2007 Sony Computer Entertainment America
-	
-	MIT License: http://www.opensource.org/licenses/mit-license.php
-*/
-
-#include "StdAfx.h"
-#include "FMAllocator.h"
-
-namespace fm
-{
-	// default to something: static initialization!
-	AllocateFunc af = malloc;
-	FreeFunc ff = free;
-	
-	void SetAllocationFunctions(AllocateFunc a, FreeFunc f)
-	{
-		af = a;
-		ff = f;
-	}
-
-	// These two are simple enough, but have the advantage of
-	// always allocating/releasing memory from the same heap.
-	void* Allocate(size_t byteCount)
-	{
-		return (*af)(byteCount);
-	}
-
-	void Release(void* buffer)
-	{
-		(*ff)(buffer);
-	}
-};
-
+/*
+	Copyright (C) 2005-2007 Feeling Software Inc.
+	Portions of the code are:
+	Copyright (C) 2005-2007 Sony Computer Entertainment America
+	
+	MIT License: http://www.opensource.org/licenses/mit-license.php
+*/
+
+#include "StdAfx.h"
+#include "FMAllocator.h"
+
+namespace fm
+{
+	AllocateFunc af;
+	FreeFunc ff;
+	
+	void SetAllocationFunctions(AllocateFunc a, FreeFunc f)
+	{
+		af = a;
+		ff = f;
+	}
+
+	// These two are simple enough, but have the advantage of
+	// always allocating/releasing memory from the same heap.
+	void* Allocate(size_t byteCount)
+	{
+		if (!af) af = malloc;
+		return (*af)(byteCount);
+	}
+
+	void Release(void* buffer)
+	{
+		if (!ff) ff = free;
+		(*ff)(buffer);
+	}
+};
+