Răsfoiți Sursa

made do_frame() pass the current thread to make it compile under linux

Dustin Barnard 19 ani în urmă
părinte
comite
3f5a8dbd69

+ 1 - 1
pandatool/src/mayaprogs/mayaEggImport.cxx

@@ -150,7 +150,7 @@ MPxFileTranslator::MFileKind MayaEggImporter::identifyFile (
   const char * name = fileName.name().asChar();
   int   nameLength = strlen(name);
   
-  if ((nameLength > 4) && !stricmp(name+nameLength-4, ".egg"))
+  if ((nameLength > 4) && !strcmp(name+nameLength-4, ".egg"))
     return kCouldBeMyFileType;
   else
     return kNotMyFileType;

+ 2 - 2
pandatool/src/mayaprogs/mayaPview.cxx

@@ -183,8 +183,8 @@ doIt(const MArgList &args) {
 
   // Allow a couple of frames to go by so the window will be fully
   // created and the text will be visible.
-  framework.do_frame();
-  framework.do_frame();
+  framework.do_frame(Thread::get_current_thread());
+  framework.do_frame(Thread::get_current_thread());
 
   window->enable_keyboard();
   window->setup_trackball();