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
aurel cordonnier
a12d56ff31
Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
...
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485
[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
ben hoffman
c968dafbd0
[Subobject Editor] Allow deletion of subobjects that are the default scene root so that they get properly replaced with a "DefaultSceneRoot" in the subobject blueprint editor.
...
#jira UE-125204
#rb phillip.kavan
#rnx
#ROBOMERGE-AUTHOR: ben.hoffman
#ROBOMERGE-SOURCE: CL 17621477 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0
[CL 17621478 by ben hoffman in ue5-release-engine-test branch]
2021-09-24 11:06:45 -04:00
ben hoffman
0775db0dbb
[Subobject Editor] Use the correct previous subobject transform when conforming a subobject to it's new parent during reparenting. Previously it was incorrectly using the same "Dropped On" subobject (which would be the new parent) thus always giving it a relative position/rotation/scale of 0 when conforming.
...
#jira UE-126632
#rb colin.mcginley
#rb benjamin.fox
#rnx
#ROBOMERGE-AUTHOR: ben.hoffman
#ROBOMERGE-SOURCE: CL 17588190 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)
[CL 17588217 by ben hoffman in ue5-release-engine-test branch]
2021-09-21 17:03:29 -04:00
aurel cordonnier
7f517562d5
Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
...
This represents UE4/Main @17430120 and Dev-PerfTest @17437669
[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
ben hoffman
1394f1b0f2
Set the parent of non-scene components correctly when converting an instance to a blueprint
...
#jira UE-120632
#rb todo
#rnx
#p4v-preflight-copy 17105167
#ROBOMERGE-SOURCE: CL 17107844 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v854-17104634)
[CL 17107929 by ben hoffman in ue5-release-engine-test branch]
2021-08-09 17:18:52 -04:00
ben hoffman
1eb5090127
Do not allow copying or duplicating subobjects with the name of "DefaultSceneRoot". This will prevent confusing renaming situations where the DefaultSceneRoot could be deleted, but still be preventing other subobjects from being named that
...
#jira UE-119104
#rb todo
#rnx
#preflight 60ff101a47c93a00010d9d2e
#ROBOMERGE-SOURCE: CL 16961027 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)
[CL 16961064 by ben hoffman in ue5-release-engine-test branch]
2021-07-26 16:58:12 -04:00
ben hoffman
2d502dcd91
When pasting a subobject, check to see if the desired parent is a scene component before allowing it to be the target of the paste. This prevents the incorrect parenting to the Actor root in the case of copy/pasting the default scene root.
...
#jira UE-119104
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 16960122 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)
[CL 16960176 by ben hoffman in ue5-release-engine-test branch]
2021-07-26 15:40:01 -04:00
jamie dale
669facc986
Fixed some more places incorrectly testing against NAME_SIZE (as it includes the null terminator)
...
#rb none
#rnx
#ROBOMERGE-SOURCE: CL 16938866 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)
[CL 16938868 by jamie dale in ue5-release-engine-test branch]
2021-07-23 13:17:09 -04:00
ben hoffman
c649f6ad6c
Change the behavior when pasting subobjects to attach to the selected subobject's parent instead of the subobject itself. This makes the pasting behavior between the blueprint and level instance editor the same.
...
#jira UE-118256
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 16901336 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16901350 by ben hoffman in ue5-release-engine-test branch]
2021-07-20 16:00:57 -04:00
ben hoffman
1aa36d7898
Only try to find a scene component target to attach to if the pasted component is a scene component. Non-Scene components can only be attached to the root actor. This solves an issue where a pasted non-scene component could be incorrectly attached to the default scene root.
...
#jira UE-117883
#rb justin.hare
#rnx
#ROBOMERGE-SOURCE: CL 16900194 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16900254 by ben hoffman in ue5-release-engine-test branch]
2021-07-20 15:09:45 -04:00
zousar shaker
d55f79222e
Wrapped ObjectPtr upgrade refresh for Engine + ShooterGame
...
#rb none
#preflight 60f6411c35476b00018dd12c
#ROBOMERGE-SOURCE: CL 16892864 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16892876 by zousar shaker in ue5-release-engine-test branch]
2021-07-20 00:24:38 -04:00
ben hoffman
4612c508e4
Add a fallback method of determining the instanced component to use as an asset override in the event that a subobjec thas been added but is not a part of the generated class yet. Do this by checking if the archetype of the GEN_VARIABLE subobject and one on the instance are the same.
...
#jira UE-119138
#rb trivial
#rnx
#preflight 60f0b58a57b3020001337e09
#ROBOMERGE-SOURCE: CL 16869367 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16869384 by ben hoffman in ue5-release-engine-test branch]
2021-07-15 19:43:19 -04:00
ben hoffman
3cc5f3f1bb
Check not only the SimpleConstructionScript's DefaultSceneRootNode, but also the SceneRootComponentTemplate when determining if a subobject is the default scene root. This handles cases where the DefaultSceneRoot node has been updated (like when you drag/drop a new scene component onto it in the Subobject Editor)
...
#jira UE-117876
#rb marc.audy
#rnx
#ROBOMERGE-SOURCE: CL 16854920 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16854923 by ben hoffman in ue5-release-engine-test branch]
2021-07-14 16:38:11 -04:00
ben hoffman
aa2e0d9b84
Check if the old scene root was the default scene root that is generated by every BP to determine if it should be deleted or not. This makes the behavior consistent with the old SCS Editor
...
#jira UE-117876
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 16854709 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16854715 by ben hoffman in ue5-release-engine-test branch]
2021-07-14 16:24:38 -04:00
ben hoffman
07d1805279
CIS fix. Remove ParentObjData from an if statement because there is already a "check" on the variable above. Having it in the if statement was causing other uses of it to flag PVS
...
#jira none
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 16854427 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16854439 by ben hoffman in ue5-release-engine-test branch]
2021-07-14 16:06:40 -04:00
ben hoffman
9433745359
Add an additional check when determining the default scene root to see if a native subobject is the root of it's owning actor.
...
#jira UE-117126
#rb trivial
#rnx
#preflight 60ee0c9119a00600011f491a
#ROBOMERGE-SOURCE: CL 16844692 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16844694 by ben hoffman in ue5-release-engine-test branch]
2021-07-13 19:29:19 -04:00
ben hoffman
1cd9ae53b3
Add a flag to force deletion on subobjects so that when making a new scene root the CanDelete check will be bypassed.
...
This is needed because when the user drags a new scene component over the existing one, the old one should be deleted but is still marked as the SceneRoot (and cannot be deleted because we have to update the instances of the archetypes)
#jira UE-119151
#rb trivial
#rnx
#preflight 60edf5d0ef22fa000176acdf
#ROBOMERGE-SOURCE: CL 16843507 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16843526 by ben hoffman in ue5-release-engine-test branch]
2021-07-13 17:56:56 -04:00
ben hoffman
74b6a53706
Fix some spelling mistakes in comments
...
#rb trivial
#rnx
#jira none
#ROBOMERGE-SOURCE: CL 16840894 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16840901 by ben hoffman in ue5-release-engine-test branch]
2021-07-13 15:04:09 -04:00
ben hoffman
30db2503ac
Replace an incorrect check for a child actor with a check for a child actor subtree object.
...
#jira none
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 16840124 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16840239 by ben hoffman in ue5-release-engine-test branch]
2021-07-13 14:25:58 -04:00
ben hoffman
71c9ffb51e
If the attachment point is a BP inherited subobject then find the correct archetype attachment point when adding subobjects to an instance
...
#rb marc.audy
#jira UE-117457
#jira UE-119112
#rnx
#preflight 60ec6955ef22fa000150f693
#ROBOMERGE-SOURCE: CL 16837795 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16837814 by ben hoffman in ue5-release-engine-test branch]
2021-07-13 11:22:30 -04:00
ben hoffman
162f09e820
Correctly check if a component is inherited before allowing it to be reparented
...
#jira UE-118270
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 16837483 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16837486 by ben hoffman in ue5-release-engine-test branch]
2021-07-13 10:54:11 -04:00
ben hoffman
1b38a5881b
Instead of checking if something is a child actor component when attempting to maniuplate it, check if its owner is a CAC instead. If it's owner is a CAC, then it cannot be removed because it is determined by the owning CAC. Before, the code was incorrectly checking if something was just a plain old child actor component, resulting in being unable to delete, reparent, or attach to a child actor component.
...
#jira UE-117132
#jira UE-117332
#jira UE-117327
#jira UE-117329
#rb marc.audy
#rnx
#preflight 60d48296925f1400010bb909
#ROBOMERGE-SOURCE: CL 16773601 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)
[CL 16773618 by ben hoffman in ue5-release-engine-test branch]
2021-06-24 10:56:30 -04:00
ben hoffman
d2bd24b5d8
Use CopyPropertiesForUnrelatedObjects instead of a basic ObjectWriter/Reader combo when duplicating components to properly handle subobjects.
...
#jira UE-68780
#rb marc.audy
#rnx
#ROBOMERGE-SOURCE: CL 16751102 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)
[CL 16751116 by ben hoffman in ue5-release-engine-test branch]
2021-06-22 19:05:23 -04:00
ben hoffman
4fe12c7941
Correctly set the module path when creating a C++ class from the subobject data subsystem. This will correctly set the module path so that the error messages are correct from GameProjectUtils::AddCodeToProject. This will make the module selection the same as how the SNewClassDialog handles it for a more consistent and correct experience.
...
#jira UE-116994
#rnx
#rb phillip.kavan
#ROBOMERGE-SOURCE: CL 16748591 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)
[CL 16749157 by ben hoffman in ue5-release-engine-test branch]
2021-06-22 17:01:44 -04:00