Rev 6 | Rev 11 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6 | Rev 9 | ||
|---|---|---|---|
| Line 925... | Line 925... | ||
| 925 | meshes = (mesh_t *) SAFE_realloc (meshes, mesh_count, mesh_count + 1, sizeof (mesh_t), false); |
925 | meshes = (mesh_t *) SAFE_realloc (meshes, mesh_count, mesh_count + 1, sizeof (mesh_t), false); |
| 926 | mesh = &meshes[mesh_count]; // quick access to the mesh we'll be working on |
926 | mesh = &meshes[mesh_count]; // quick access to the mesh we'll be working on |
| 927 | 927 | ||
| 928 | // load the mesh |
928 | // load the mesh |
| 929 | if (!Render_LoadMesh_Obj (mesh, meshfile_pathname)) |
929 | if (!Render_LoadMesh_Obj (mesh, meshfile_pathname)) |
| 930 | { |
- | |
| 931 | MessageBox (NULL, LOCALIZE (L"Error_UnableToAddMeshD3DXLoadMeshFromXFailed"), LOCALIZE (L"FatalError"), MB_ICONERROR | MB_OK); |
- | |
| 932 | return (-1); // bomb out on error |
930 | return (-1); // bomb out on error |
| 933 | } |
- | |
| 934 | 931 | ||
| 935 | mesh->hash = hash; // save the hash |
932 | mesh->hash = hash; // save the hash |
| 936 | mesh_count++; // we know now one mesh more |
933 | mesh_count++; // we know now one mesh more |
| 937 | return (mesh_count - 1); // return its index |
934 | return (mesh_count - 1); // return its index |
| 938 | } |
935 | } |