TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Maya 2016.5 on 1.9 branch; fix Maya 2016.5 build on Mac OS X

Browse Source
This commit is contained in:
rdb 2016-06-27 01:06:07 +02:00
parent 7dfd907e17
commit 46147e9a09
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/ReleaseNotes
View File

@ -15,6 +15,7 @@ This issue fixes several bugs that were still found in 1.9.2.
* Work around GLSL issue with #pragma and certain Intel drivers * Work around GLSL issue with #pragma and certain Intel drivers
* Improve performance of texture load and store operations * Improve performance of texture load and store operations
* Fix crashes with pbuffers on Intel cards on Windows * Fix crashes with pbuffers on Intel cards on Windows
* Support for Autodesk Maya 2016.5
------------------------ RELEASE 1.9.2 ------------------------ ------------------------ RELEASE 1.9.2 ------------------------

1
makepanda/makepandacore.py
View File

@ -80,6 +80,7 @@ MAYAVERSIONINFO = [("MAYA6", "6.0"),
("MAYA2014","2014"), ("MAYA2014","2014"),
("MAYA2015","2015"), ("MAYA2015","2015"),
("MAYA2016","2016"), ("MAYA2016","2016"),
("MAYA20165","2016.5"),
] ]
MAXVERSIONINFO = [("MAX6", "SOFTWARE\\Autodesk\\3DSMAX\\6.0", "installdir", "maxsdk\\cssdk\\include"), MAXVERSIONINFO = [("MAX6", "SOFTWARE\\Autodesk\\3DSMAX\\6.0", "installdir", "maxsdk\\cssdk\\include"),

5
pandatool/src/maya/mayaApi.cxx
View File

@ -199,9 +199,10 @@ open_api(string program_name, bool view_license, bool revertdir) {
size_t dot2 = runtime_version.find('.', dot1 + 1); size_t dot2 = runtime_version.find('.', dot1 + 1);
if (dot2 == string::npos) { if (dot2 == string::npos) {
rtver_b = 0; string_to_int(runtime_version.substr(dot1 + 1), rtver_b);
} else { } else {
string_to_int(runtime_version.substr(dot1, dot2 - dot1), rtver_b); string_to_int(runtime_version.substr(dot1 + 1, dot2 - dot1 - 1), rtver_b);
simple_runtime_version = runtime_version.substr(0, dot2); simple_runtime_version = runtime_version.substr(0, dot2);
} }
} }

8
pandatool/src/maya/pre_maya_include.h
View File

@ -64,8 +64,12 @@ typedef istream maya_istream;
#endif // PHAVE_IOSTREAM #endif // PHAVE_IOSTREAM
#ifdef __MACH__ #ifdef __MACH__
#undef _BOOL #define OSMac_ 1
#include "maya/OpenMayaMac.h" // This defines MAYA_API_VERSION
#include <maya/MTypes.h>
#if MAYA_API_VERSION < 201600
#include <maya/OpenMayaMac.h>
#endif
#endif #endif
#endif // MAYA_PRE_5_0 #endif // MAYA_PRE_5_0

8
pandatool/src/mayaprogs/mayaSavePview.h
View File

@ -26,8 +26,12 @@
#endif #endif
#ifdef __MACH__ #ifdef __MACH__
#undef _BOOL #define OSMac_ 1
#include "maya/OpenMayaMac.h" // This defines MAYA_API_VERSION
#include <maya/MTypes.h>
#if MAYA_API_VERSION < 201600
#include <maya/OpenMayaMac.h>
#endif
#endif #endif
// Even though we don't include any Panda headers, it's safe to // Even though we don't include any Panda headers, it's safe to

1
pandatool/src/mayaprogs/mayapath.cxx
View File

@ -102,6 +102,7 @@ struct MayaVerInfo maya_versions[] = {
{ "MAYA2014", "2014"}, { "MAYA2014", "2014"},
{ "MAYA2015", "2015"}, { "MAYA2015", "2015"},
{ "MAYA2016", "2016"}, { "MAYA2016", "2016"},
{ "MAYA20165", "2016.5"},
{ 0, 0 }, { 0, 0 },
}; };