Commit Graph

58 Commits

Author SHA1 Message Date
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
john vanderburg
bd18dc7da2 [MLDeformer] A complete redesign, turning this into a whole framework that can handle different models.
#preflight 18324456

[CL 19587235 by john vanderburg in ue5-main branch]
2022-04-01 09:28:27 -04:00
max chen
1751c784a3 Anim: Remove AnimInstance->Montage_Stop which is stopping all montages when unbinding from Sequencer. Sequencer already stores and restores the specific montages that need to be stopped in FStopPlayingMontageTokenProducer.
#jira UE-88590
#preflight 61e05bcb787db720a90db685
#rb thomas.sarkanen

#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 18647408 in //UE5/Release-5.0/... via CL 18649164 via CL 18649569
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v900-18638592)

[CL 18649886 by max chen in ue5-main branch]
2022-01-18 17:43:49 -05:00
jurre debaare
d15fb76ed9 CTRL+Z/CTRL+Y doesn't undo/redo changes in Additional Meshes in Animation Sequence
#jira UE-136533
#fix ensure that the transient preview mesh collection asset is marked as transactional
#preflight 61dd90eb4533f92a4e26d8d3

#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 18571625 in //UE5/Release-5.0/... via CL 18571636
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18571650 by jurre debaare in ue5-release-engine-test branch]
2022-01-11 09:51:01 -05:00
thomas sarkanen
f0f3d80ab2 Fixed ensure when opening some linked animation blueprints
Linked anim BPs can be debugged, but logic to setup the debugged object based on skeletal mesh made some assumptions that only the main anim instance would be the class being set. Expanding the check here for that fallback logic application to cast a wider net than just the preview instance fixes an ensure.
Found while investgating UE-110612.

#jira none

#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 18465867 in //UE5/Release-5.0/... via CL 18465873
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18465885 by thomas sarkanen in ue5-release-engine-test branch]
2021-12-15 04:56:40 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
helge mathee
001d54081e Persona: Guard against null ptr in anim editor preview scene
#jira UE-118513
#rb trivial

#ROBOMERGE-SOURCE: CL 16727570 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16727571 by helge mathee in ue5-release-engine-test branch]
2021-06-21 09:25:59 -04:00
Helge Mathee
abbcbad986 Control Rig: Capsule based bone selection
#rb sara.schvartzman kevin.ortegren
#jira UE-101243

[CL 16492444 by Helge Mathee in ue5-main branch]
2021-05-27 17:36:23 -04:00
cedric caillaud
99765917bd Physics asset editor : improvement and bug fixes
- add isolate mode for showing colliding rigid bodies ( hotkey : C )
- fix right click menu clearing multi-selection

[CL 16176624 by cedric caillaud in ue5-main branch]
2021-05-01 00:26:30 -04:00
Thomas Sarkanen
b7771aaa90 Edigrating CLs 15666719 and 15675845.
Fixed check when blending curves when the required bones of linked anim instances were inconsistent with the main instance

This was caused by skeletal meshes streaming out setting the predicted LOD level without flagging required bones for recalculation, which meant that when a linked anim instance was created at a point where a LOD streamed out it could then build required bones at a different LOD to the main instance (e.g. main instance's required bones would be left at LOD 0, but linked instance's would be rebuilt at LOD 1).
Added accessors to the PredictedLODLevel and deprecated direct access to the member due to the potential for it to cause havoc if it is abused.

and

Prevent first-frame rendering issues when spawning LOD stripped skeletal meshes

#jira MH-3083
#jira UE-107627
#jira UE-78773
#jira FORT-354970
#jira FORT-345744
#jira FORT-355705
#rb Jurre.deBaare

[CL 15676600 by Thomas Sarkanen in ue5-main branch]
2021-03-11 10:57:49 -04:00
john vanderburg
398515a9d3 Initial support for skeletal remapping, which allows you to play animation assets from one skeleton onto the other.
[CL 15464346 by john vanderburg in ue5-main branch]
2021-02-18 18:42:00 -04:00
Alexis Matte
73d83c6a38 To protect the skeletalmesh when using async operations like build or re-import we deprecate all public member variables of USkeletalMesh class and create the necessary getter and setter. Those member will stay public but will be move to private in a future release.
Adding a public member to USkeletalMesh class is now prohibed since it can break asynchronous operations that will be added next to this submit.

#rb danny.couture
#jira UEENT-3936
#rnx

[CL 14812920 by Alexis Matte in ue5-main branch]
2020-11-25 11:17:08 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Lina Halper
44c1bb3292 COPY from //Dev-Anim to //Dev-Main
#rb: none
#fyi: Laurent.Delayen, Thomas.Sarkanen

[CL 11088765 by Lina Halper in Main branch]
2020-01-22 17:58:55 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
satchit subramanian
c08663c6d4 Make animation preview scene additional meshes non-selectable in phat.
#rb Michael.Lentine


#ROBOMERGE-SOURCE: CL 9884388 via CL 9885015 via CL 9885036
#ROBOMERGE-BOT: (v553-9872581)

[CL 9885049 by satchit subramanian in Main branch]
2019-10-29 15:46:09 -04:00
thomas sarkanen
53708c2257 Renaming layer and sub-instance related APIs
#jira UE-80147 - Rename new anim layer related APIs
#rb Jurre.deBaare


#ROBOMERGE-OWNER: thomas.sarkanen
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 8973946 via CL 8973950 via CL 8973951
#ROBOMERGE-BOT: (v438-8971340)

[CL 8974019 by thomas sarkanen in Main branch]
2019-09-23 07:23:26 -04:00
laurent delayen
c4e1a4e08f Fixed robomerge conflict
#fyi thomas.sarkanen

Add the ability to preview of layer overlays and sub-instances in the animation blueprint editor

This change adds a new 'preview animation blueprint' to UAnimBlueprint. This is a blueprint that hosts a sub-instance/layer BP for preview purposes. Setting this in a BP will show a preview in the viewport of the BP running as a sub-instance of the preview instance, thus allowing for sub-instances to be previewed in context.

#jira UE-78536 - Preview output of animation layers
#rb Jurre.deBaare


#ROBOMERGE-OWNER: laurent.delayen
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 8591775 via CL 8617549
#ROBOMERGE-BOT: (v409-8614070)

[CL 8631092 by laurent delayen in Main branch]
2019-09-10 20:49:17 -04:00
helge mathee
a6a2a333c0 Final copy-up for Control Rig Task Stream.
Merging using Fortnite_Main<->Fortnite_ControlRig

#rb none


#ROBOMERGE-OWNER: helge.mathee
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 7321580 via CL 7323175
#ROBOMERGE-BOT: (v371-7306989)

[CL 7323351 by helge mathee in Main branch]
2019-07-16 11:49:59 -04:00
mike zyracki
6c525fe7cd Add bWasCreated flag to BindToSkeletalMesh so when we know when we create the sequencer anim instance we should save the pose. This removes the need for control rig to override NativeInitialization. Also add some checks to make sure we save a valid pose.
#jira UE-76569

#rb max.chen

#ROBOMERGE-SOURCE: CL 7280102 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7280144 by mike zyracki in Main branch]
2019-07-11 15:56:39 -04:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Ben Marsh
ea340d3fbf Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4567513 by Ben Marsh in Main branch]
2018-11-14 19:05:13 -05:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00
Thomas Sarkanen
170ef1a37c Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4096586
#fyi Laurent.Delayen,James.Golding
#rb none

[CL 4097208 by Thomas Sarkanen in Dev-Anim branch]
2018-05-29 11:27:23 -04:00