From 30422fa6830a8977e40f0df0cc70bf5a969fc02e Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Sat, 7 Jul 2012 20:53:24 +0200 Subject: [PATCH] - fix confusion between ASSIMP_BUILD_NO_COLLADA_IMPORTER and ASSIMP_BUILD_NO_DAE_IMPORTER (in favour of the first). --- code/ColladaLoader.cpp | 2 +- code/ColladaParser.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index 3f5019bb4..bdda06531 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Implementation of the Collada loader */ #include "AssimpPCH.h" -#ifndef ASSIMP_BUILD_NO_DAE_IMPORTER +#ifndef ASSIMP_BUILD_NO_COLLADA_IMPORTER #include "../include/assimp/anim.h" #include "ColladaLoader.h" diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp index 78b66bd62..43ee1940e 100644 --- a/code/ColladaParser.cpp +++ b/code/ColladaParser.cpp @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AssimpPCH.h" -#ifndef ASSIMP_BUILD_NO_DAE_IMPORTER +#ifndef ASSIMP_BUILD_NO_COLLADA_IMPORTER #include "ColladaParser.h" #include "fast_atof.h"