From 196cdef8a28c57c5b96c831dc37cb543b73d84bf Mon Sep 17 00:00:00 2001
From: Chris Brunner <github@chrisweb.us>
Date: Mon, 16 May 2011 21:18:07 +0000
Subject: [PATCH] support for Maya2012

---
 makepanda/makepandacore.py              | 1 +
 pandatool/src/mayaprogs/mayaWrapper.cxx | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index 2777abe202..ee44b20a58 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -40,6 +40,7 @@ MAYAVERSIONINFO=[("MAYA6",   "6.0"),
                  ("MAYA2009","2009"),
                  ("MAYA2010","2010"),
                  ("MAYA2011","2011"),
+                 ("MAYA2012","2012"),
 ]
 
 MAXVERSIONINFO = [("MAX6", "SOFTWARE\\Autodesk\\3DSMAX\\6.0", "installdir", "maxsdk\\cssdk\\include"),
diff --git a/pandatool/src/mayaprogs/mayaWrapper.cxx b/pandatool/src/mayaprogs/mayaWrapper.cxx
index 47b64e8692..9a70626572 100644
--- a/pandatool/src/mayaprogs/mayaWrapper.cxx
+++ b/pandatool/src/mayaprogs/mayaWrapper.cxx
@@ -58,6 +58,7 @@ struct { char *ver, *key; } maya_versions[] = {
   { "MAYA2009", "2009" },
   { "MAYA2010", "2010" },
   { "MAYA2011", "2011"},
+  { "MAYA2012", "2012"},
   { 0, 0 },
 };
 
@@ -288,8 +289,8 @@ int main(int argc, char **argv)
   // bin\python25.zip (within loc)
   // Python\lib\site-packages (within loc)
   // ...so set PYTHONPATH accordingly:
-  if (strcmp(key, "2011") == 0) {
-    //Maya 2011 is built against Python 2.6 so look for that one instead
+  if (strcmp(key, "2011") == 0 || strcmp(key, "2012") == 0) {
+    //Maya 2011 and 2012 are built against Python 2.6 so look for that one instead
     sprintf(env4, "PYTHONPATH=%s\\bin\\python26.zip;%s\\Python\\lib\\site-packages", loc, loc);
   } else {
     sprintf(env4, "PYTHONPATH=%s\\bin\\python25.zip;%s\\Python\\lib\\site-packages", loc, loc);