Skip to content

Commit 84e2468

Browse files
authored
Merge pull request #593 from KhronosGroup/misc/max-2019
added max 2019
2 parents ba14e3b + 685c47d commit 84e2468

File tree

7 files changed

+793
-345
lines changed

7 files changed

+793
-345
lines changed

COLLADAMax/COLLADAMax.sln

Lines changed: 234 additions & 7 deletions
Large diffs are not rendered by default.

COLLADAMax/include/COLLADAMaxPrerequisites.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,13 @@
126126
# define MAX_2018
127127
#endif
128128

129+
#if ( MAX_VERSION_MAJOR >= 21 )
130+
# define MAX_2019_OR_NEWER
131+
#endif
132+
#if ( MAX_VERSION_MAJOR == 21 )
133+
# define MAX_2019
134+
#endif
135+
129136
// Max 2009 requires RTTI to be enabled
130137
#ifdef MAX_2009_OR_NEWER
131138
#ifndef _CPPRTTI

COLLADAMax/include/COLLADAMaxStableHeaders.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
# pragma message ("Compiling for Max2017")
5151
#elif defined MAX_2018
5252
# pragma message ("Compiling for Max2018")
53+
#elif defined MAX_2019
54+
# pragma message ("Compiling for Max2019")
5355
#else
5456
# error( "Unsupported Max version" )
5557
#endif

COLLADAMax/scripts/COLLADAMax.vcxproj

Lines changed: 546 additions & 13 deletions
Large diffs are not rendered by default.

COLLADAMax/src/COLLADAMaxGeometryExporter.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1325,8 +1325,11 @@ namespace COLLADAMax
13251325
maxobj->MakeBezier(0, shape);
13261326

13271327
// for each curve
1328+
#ifdef MAX_2019_OR_NEWER
1329+
int splinesCount = min(shape.SplineCount(), maxobj->NumberOfCurves(0));
1330+
#else
13281331
int splinesCount = min(shape.SplineCount(), maxobj->NumberOfCurves());
1329-
1332+
#endif
13301333
if( splinesCount < 1 )
13311334
{
13321335
// no spline to export

COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj

Lines changed: 0 additions & 158 deletions
Large diffs are not rendered by default.

common/libftoa/scripts/libftoa.vcxproj

Lines changed: 0 additions & 166 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)