Merge pull request #593 from KhronosGroup/misc/max-2019

added max 2019
KhronosGroup · Oct 11, 2018 · 84e2468 · 84e2468
2 parents ba14e3b + 685c47d
commit 84e2468
Show file tree

Hide file tree

Showing 7 changed files with 793 additions and 345 deletions.
diff --git a/COLLADAMax/COLLADAMax.sln b/COLLADAMax/COLLADAMax.sln
diff --git a/COLLADAMax/include/COLLADAMaxPrerequisites.h b/COLLADAMax/include/COLLADAMaxPrerequisites.h
@@ -126,6 +126,13 @@
 #  define MAX_2018
 #endif
 
+#if ( MAX_VERSION_MAJOR >= 21 )
+#  define MAX_2019_OR_NEWER
+#endif
+#if ( MAX_VERSION_MAJOR == 21 )
+#  define MAX_2019
+#endif
+
 // Max 2009 requires RTTI to be enabled
 #ifdef MAX_2009_OR_NEWER
 #ifndef _CPPRTTI

diff --git a/COLLADAMax/include/COLLADAMaxStableHeaders.h b/COLLADAMax/include/COLLADAMaxStableHeaders.h
@@ -50,6 +50,8 @@
 #	pragma message ("Compiling for Max2017")
 #elif defined MAX_2018
 #	pragma message ("Compiling for Max2018")
+#elif defined MAX_2019
+#	pragma message ("Compiling for Max2019")
 #else
 #	error( "Unsupported Max version" )
 #endif

diff --git a/COLLADAMax/scripts/COLLADAMax.vcxproj b/COLLADAMax/scripts/COLLADAMax.vcxproj
diff --git a/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp b/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp
@@ -1325,8 +1325,11 @@ namespace COLLADAMax
 		maxobj->MakeBezier(0, shape);
 
 		// for each curve
+#ifdef MAX_2019_OR_NEWER
+		int splinesCount = min(shape.SplineCount(), maxobj->NumberOfCurves(0));
+#else
 		int splinesCount = min(shape.SplineCount(), maxobj->NumberOfCurves());
-
+#endif		
 		if( splinesCount < 1 )
 		{
 			// no spline to export

diff --git a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj
diff --git a/common/libftoa/scripts/libftoa.vcxproj b/common/libftoa/scripts/libftoa.vcxproj