瀏覽代碼

more maya 2008 weirdness

David Rose 18 年之前
父節點
當前提交
0a616b4ec3
共有 1 個文件被更改,包括 10 次插入1 次删除
  1. 10 1
      pandatool/src/maya/mayaApi.cxx

+ 10 - 1
pandatool/src/maya/mayaApi.cxx

@@ -170,6 +170,15 @@ open_api(string program_name) {
 
 
     string runtime_version = MGlobal::mayaVersion().asChar();
     string runtime_version = MGlobal::mayaVersion().asChar();
     string simple_runtime_version = runtime_version;
     string simple_runtime_version = runtime_version;
+    runtime_version = trim(runtime_version);
+
+    // If the version number contains a space, stop there (that would
+    // be "service pack 1" or whatever).
+    size_t space = runtime_version.find(' ');
+    if (space != string::npos) {
+      runtime_version = runtime_version.substr(0, space);
+    }
+
     int rtver_a, rtver_b;
     int rtver_a, rtver_b;
     size_t dot1 = runtime_version.find('.');
     size_t dot1 = runtime_version.find('.');
     if (dot1 == string::npos) {
     if (dot1 == string::npos) {
@@ -198,7 +207,7 @@ open_api(string program_name) {
         << runtime_version << ".\n";
         << runtime_version << ".\n";
     }
     }
 
 
-    if (MAYA_API_VERSION != runtime_version_int) {
+    if (MAYA_API_VERSION / 10 != runtime_version_int / 10) {
       maya_cat.warning()
       maya_cat.warning()
         << "This program was compiled using Maya version " 
         << "This program was compiled using Maya version " 
         << (MAYA_API_VERSION / 100) << "." << (MAYA_API_VERSION / 10) % 10
         << (MAYA_API_VERSION / 100) << "." << (MAYA_API_VERSION / 10) % 10