Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts: # Source/Engine/Navigation/NavMesh.cpp # Source/Engine/Navigation/NavMeshBuilder.cpp
This commit is contained in:
@@ -175,7 +175,7 @@ public:
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Attaches collider to the the specified rigid body.
|
||||
/// Attaches collider to the specified rigid body.
|
||||
/// </summary>
|
||||
/// <param name="rigidBody">The rigid body.</param>
|
||||
void Attach(RigidBody* rigidBody);
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#define ENSURE_CAN_COOK \
|
||||
if (Physics::GetCooking() == nullptr) \
|
||||
{ \
|
||||
LOG(Warning, "Physics collisions cooking is disabled at runtime. Enable Physics Settigns option SupportCookingAtRuntime to use terrain generation at runtime."); \
|
||||
LOG(Warning, "Physics collisions cooking is disabled at runtime. Enable Physics Settings option SupportCookingAtRuntime to use terrain generation at runtime."); \
|
||||
return true; \
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user