Merge remote-tracking branch 'official/master' into contrib

This commit is contained in:
Léo Terziman
2015-04-28 12:04:53 +02:00
342 changed files with 25014 additions and 13663 deletions

View File

@@ -43,12 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @brief Implementation of the Collada parser helper
*/
#include "AssimpPCH.h"
#ifndef ASSIMP_BUILD_NO_COLLADA_IMPORTER
#include "ColladaParser.h"
#include "fast_atof.h"
#include "ParsingUtils.h"
#include "ParsingUtils.h"
#include <boost/scoped_ptr.hpp>
#include <boost/foreach.hpp>
#include "../include/assimp/DefaultLogger.hpp"
#include "../include/assimp/IOSystem.hpp"
#include "../include/assimp/light.h"
using namespace Assimp;
using namespace Assimp::Collada;