UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 15:24:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2018-03-20 16:41:42 +01:00
commit 7e57143dab
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-ue4/Config/DefaultEngine.ini
View File

@ -6,6 +6,10 @@ AppliedTargetedHardwareClass=Desktop
DefaultGraphicsPerformance=Maximum
AppliedDefaultGraphicsPerformance=Maximum
[/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/Test/Test.Test
GlobalDefaultGameMode=/Game/Test/Blueprints/TouchClick.TouchClick_C
[/Script/Engine.PhysicsSettings]
DefaultGravityZ=-980.000000
DefaultTerminalVelocity=4000.000000

BIN
spine-ue4/Content/Test/Blueprints/TwoColor_Blueprint.uasset
View File

Binary file not shown.

BIN
spine-ue4/Content/Test/Test.umap
View File

Binary file not shown.

2
spine-ue4/Plugins/RuntimeMeshComponentPlugin/Source/RuntimeMeshComponent/Private/RuntimeMeshComponent.cpp
View File

@ -1778,7 +1778,7 @@ void URuntimeMeshComponent::UpdateCollision()
BodySetup->BodySetupGuid = FGuid::NewGuid();
#if WITH_RUNTIME_PHYSICS_COOKING || WITH_EDITOR
#if WITH_RUNTIME_PHYSICS_COOKING || WITH_PHYSX || WITH_EDITOR
// Clear current mesh data
BodySetup->InvalidatePhysicsData();
// Create new mesh data