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

doc/ReleaseNotes

@@ -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
 * Improve performance of texture load and store operations
 * Fix crashes with pbuffers on Intel cards on Windows
+* Support for Autodesk Maya 2016.5
 
 ------------------------  RELEASE 1.9.2  ------------------------
 

makepanda/makepandacore.py

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

pandatool/src/maya/mayaApi.cxx

@@ -199,9 +199,10 @@ open_api(string program_name, bool view_license, bool revertdir) {
       
       size_t dot2 = runtime_version.find('.', dot1 + 1);
       if (dot2 == string::npos) {
-        rtver_b = 0;
+        string_to_int(runtime_version.substr(dot1 + 1), rtver_b);
+
       } 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);
       }
     }

pandatool/src/maya/pre_maya_include.h

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

pandatool/src/mayaprogs/mayaSavePview.h

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

pandatool/src/mayaprogs/mayapath.cxx

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