diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-04-25 16:02:08 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-04-25 16:02:08 -0500 |
| commit | d11708e398c2f6377d9eac2b1f7248c62faab569 (patch) | |
| tree | 5778e794690c046ab4b0205d8f764960a5af168b /PhysX_3.4/Samples | |
| parent | PhysX 3.4, APEX 1.4 patch release @21821222 (diff) | |
| download | physx-3.4-d11708e398c2f6377d9eac2b1f7248c62faab569.tar.xz physx-3.4-d11708e398c2f6377d9eac2b1f7248c62faab569.zip | |
PhysX 3.4, APEX 1.4 patch release @22017166
Diffstat (limited to 'PhysX_3.4/Samples')
| -rw-r--r-- | PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h | 7 | ||||
| -rw-r--r-- | PhysX_3.4/Samples/SampleVehicle/SampleVehicle_VehicleManager.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h b/PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h index 91ccd888..0113bbcd 100644 --- a/PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h +++ b/PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h @@ -66,7 +66,12 @@ namespace PxToolkit PX_INLINE physx::PxI32 fopen_s(FILE** file, const char* name, const char* mode) { FILE* fp = ::fopen(name, mode); - return fp ? *file = fp, physx::PxI32(0) : -1; + if (fp) + { + *file = fp; + return 0; + } + return -1; } } // PxToolkit diff --git a/PhysX_3.4/Samples/SampleVehicle/SampleVehicle_VehicleManager.cpp b/PhysX_3.4/Samples/SampleVehicle/SampleVehicle_VehicleManager.cpp index 5f38d410..a7c163e4 100644 --- a/PhysX_3.4/Samples/SampleVehicle/SampleVehicle_VehicleManager.cpp +++ b/PhysX_3.4/Samples/SampleVehicle/SampleVehicle_VehicleManager.cpp @@ -46,8 +46,6 @@ #include "geometry/PxConvexMeshGeometry.h" #include "SampleAllocatorSDKClasses.h" -#include "PxVehicleSerialization.h" - /////////////////////////////////// SampleVehicle_VehicleManager::SampleVehicle_VehicleManager() |