Commit Graph

39 Commits

Author SHA1 Message Date
Matt Peters
7ad238a806 AssetRegistry includes (Engine/Source): change #include "AssetData.h" -> #include "AssetRegistry/AssetData.h", and similar for the other moved AssetRegistry headers.
#rb Zousar.Shaker
#rnx
#preflight 6270509a220f89f0ad573030

[CL 20016982 by Matt Peters in ue5-main branch]
2022-05-02 18:06:48 -04:00
Matt Peters
c1b46b1fed FAssetData: Callsites need to handle AssetData.GetClass() returning null. Added IsInstanceOf(UClass*) for the common operation GetClass() && GetClass->IsChildOf(BaseClass).
#jira UE-146521
#rb Zousar.Shaker
#rnx
#preflight 623874b789625f06129e466b

[CL 19450936 by Matt Peters in ue5-main branch]
2022-03-21 09:00:36 -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
lauren barnes
0b7ecd97c1 The Create menu entry should pull its name from the asset vs. the factory in most cases
#jira none
#rb Brooke.Hubert

#ROBOMERGE-SOURCE: CL 16606590 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16606596 by lauren barnes in ue5-release-engine-test branch]
2021-06-09 11:59:28 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
dave belanger
d7c401a67c Fix PlacementModeModule event declaration
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 15586483 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)

[CL 15586551 by dave belanger in ue5-main branch]
2021-03-03 15:42:02 -04:00
dave belanger
763e3d01c0 Manual merge from UE4
Placement tool item predicates
#rb Rex.Hill

#ROBOMERGE-SOURCE: CL 15586288 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)

[CL 15586411 by dave belanger in ue5-main branch]
2021-03-03 15:31:08 -04:00
dave belanger
a0918d345f Manual merge from UE4
Placement Tool:
- Add category blacklist
- Don't trigger OnAllPlaceableAssetsChanged event during initial loading of assets
#rb Rex.Hill

#ROBOMERGE-SOURCE: CL 15585527 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)

[CL 15585530 by dave belanger in ue5-main branch]
2021-03-03 14:33:59 -04:00
Louise Rasmussen
d52549d8d7 Placement Mode: shape category special icon handling and updates to plugins using FPlaceableItem
#rb lauren.barnes
#JIRA UETOOL-2864

[CL 15212946 by Louise Rasmussen in ue5-main branch]
2021-01-26 19:20:39 -04:00
Louise Rasmussen
c89584e7cb Place Actors (aka Placement Mode) Quick Toolbar Menu
#JIRA UETOOL-2864

#rb Lauren.Barnes

[CL 15168528 by Louise Rasmussen in ue5-main branch]
2021-01-22 19:32:07 -04:00
Matt Kuhlenschmidt
cd26fdd0cf Tab drawer improvements
- activating an editor mode that was already active but in an drawer, opens that drawer
- dock tabs can now register for drawer opening/closing callbacks so that they can do stuff when the drawer opens or closes. For example, now the placement browser focuses its search field when the drawer opens

[CL 14723696 by Matt Kuhlenschmidt in ue5-main branch]
2020-11-11 16:21:17 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
brooke hubert
6256c51b62 Remove legacy placement editor mode.
#rnx
#Jira UE-97664
#rb matt.kuhlenschmidt

[CL 14269170 by brooke hubert in ue5-main branch]
2020-09-08 12:11:22 -04:00
Matt Kuhlenschmidt
5f4719ce4d Fix placement mode compile error
#fyi louise.rasmussen

[CL 14252594 by Matt Kuhlenschmidt in ue5-main branch]
2020-09-03 09:27:27 -04:00
Louise Rasmussen
0909bf3845 Placement Browser Style Updates
#rb matt.kuhlenschmidt

[CL 14249632 by Louise Rasmussen in ue5-main branch]
2020-09-02 19:54:34 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -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
Chris Gagnon
346a4b05ea Copy up from Dev-Editor @10681378
#rb none

[CL 10837446 by Chris Gagnon in Dev-Tools-Staging branch]
2019-12-19 18:07:47 -05:00
Max Chen
4561801a81 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
#rb none

[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05: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
Matt Kuhlenschmidt
e35d32b300 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4170088 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-06-28 11:46:19 -04:00