From 5dc58359e032b89622f66802bccd73aee8564472 Mon Sep 17 00:00:00 2001 From: Peter Sauerbrei Date: Thu, 22 May 2014 15:24:52 -0400 Subject: [PATCH] fixed issues with Tappy Chicken merge #ue4 #tappy chicken [CL 2082276 by Peter Sauerbrei in Main branch] --- .../Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp | 2 ++ Engine/Source/Runtime/Engine/Public/EngineDefines.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp index d1d30681947f..b855a8320210 100644 --- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp +++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp @@ -296,10 +296,12 @@ void FPhysSubstepTask::SubstepSimulationStart() float DeltaTime = bLastSubstep ? (DeltaSeconds - TotalSubTime) : SubTime; float Interpolation = bLastSubstep ? 1.f : Alpha; +#if WITH_VEHICLE if (VehicleManager) { VehicleManager->Update(DeltaTime); } +#endif SubstepInterpolation(Interpolation); diff --git a/Engine/Source/Runtime/Engine/Public/EngineDefines.h b/Engine/Source/Runtime/Engine/Public/EngineDefines.h index 9689415f9936..638f1b783587 100644 --- a/Engine/Source/Runtime/Engine/Public/EngineDefines.h +++ b/Engine/Source/Runtime/Engine/Public/EngineDefines.h @@ -22,6 +22,13 @@ #define WITH_APEX (1 && WITH_PHYSX) #endif +/** + * Whether or not compiling with Vehicle extensions to PhysX + */ +#ifndef WITH_VEHICLE + #define WITH_VEHICLE (1 && WITH_PHYSX) +#endif + #ifndef WITH_PHYSICS_COOKING #define WITH_PHYSICS_COOKING (WITH_EDITOR || WITH_APEX) //APEX currently relies on cooking even at runtime #endif