TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changes suggested by liuzhengcai to fix 3dsmax 2014 build

Browse Source
This commit is contained in:
rdb 2016-10-31 20:46:20 +01:00
parent 34b8e0844e
commit c822fb57af
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandatool/src/maxprogs/maxEggImport.cxx
View File

@ -181,7 +181,8 @@ static INT_PTR CALLBACK ImportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
return TRUE; return TRUE;
} }
int MaxEggImporter::DoImport(const TCHAR *name,ImpInterface *ii,Interface *i, BOOL suppressPrompts) { int MaxEggImporter::
DoImport(const TCHAR *name, ImpInterface *ii, Interface *i, BOOL suppressPrompts) {
// Prompt the user with our dialogbox. // Prompt the user with our dialogbox.
if (!DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_IMPORT_DLG), if (!DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_IMPORT_DLG),
i->GetMAXHWnd(), ImportDlgProc, (LPARAM)this)) { i->GetMAXHWnd(), ImportDlgProc, (LPARAM)this)) {
@ -190,13 +191,23 @@ int MaxEggImporter::DoImport(const TCHAR *name,ImpInterface *ii,Interface *i, BO
std::ostringstream log; std::ostringstream log;
Notify::ptr()->set_ostream_ptr(&log, false); Notify::ptr()->set_ostream_ptr(&log, false);
#ifdef _UNICODE
char sname[2048];
sname[2047] = 0;
wcstombs(sname, name, 2047);
bool ok = MaxLoadEggFile(sname, _merge ? true:false, _importmodel ? true:false, _importanim ? true:false);
#else
bool ok = MaxLoadEggFile(name, _merge ? true:false, _importmodel ? true:false, _importanim ? true:false); bool ok = MaxLoadEggFile(name, _merge ? true:false, _importmodel ? true:false, _importanim ? true:false);
#endif
string txt = log.str(); string txt = log.str();
if (txt != "") { if (txt != "") {
MessageBox(NULL, txt.c_str(), "Panda3D Importer", MB_OK); MessageBoxA(NULL, txt.c_str(), "Panda3D Importer", MB_OK);
} else { } else if (!ok) {
if (!ok) MessageBox(NULL, "Import Failed, unknown reason\n", "Panda3D Importer", MB_OK); MessageBoxA(NULL, "Import Failed, unknown reason\n", "Panda3D Importer", MB_OK);
} }
Notify::ptr()->set_ostream_ptr(NULL, false); Notify::ptr()->set_ostream_ptr(NULL, false);
return 1; return 1;
} }