Commit Graph

14 Commits

Author SHA1 Message Date
jonathan bard
0270cbb1ae Fixed crash when dropping a BP actor with a nested water body actor in a map with a landscape but no water brush and/or water mesh actor: in that case, the addition of the actor will trigger a UWorld::SpawnActor to create the missing actors, which is forbidden during a construction script :
* Changed the API of the actor factory's CreateActor/SpawnActor in order to take a FActorSpawnParameters in parameter, so as to expose UWorld::SpawnActor's own option to the factory user.
* The level pointer is still part of the function prototypes in order to make it explicit to the user that he needs to pass in a valid ULevel (rather than relying on FActorSpawnParameters's OverrideLevel, which is easy to miss). In the case where OverrideLevel is indeed passed within FActorSpawnParameters, the functions validate that the pointer is the same as the level param
* Also, removed automatic creation of water mesh actor on map load : this is not playing well with world partition because it will keep on creating new actors if the level containing the water mesh actor is not loaded

#rb marc.audy, kevin.ortegren
#jira none
#tests editor + full build preflight

[CL 16219600 by jonathan bard in ue5-main branch]
2021-05-06 08:19: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
michael daum
7c6d7b3ab2 Drastically reduce the number of targets depending on UnrealWidget.h
#rb lauren.barnes

[CL 14266936 by michael daum in ue5-main branch]
2020-09-07 20:36:09 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -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
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
richard malo
56546d995d Renamed ALandscapeBlueprintCustomBrush to ALandscapeBlueprintBrush, moved it in LandscapeEditorUtilities module and added a runtime base class ALandscapeBlueprintBrushBase. This was done so that landscape blueprints brushes can access editor functions.
#rb patrick.enfedaque
#rnx


#ROBOMERGE-OWNER: richard.malo
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6988537 via CL 7010009
#ROBOMERGE-BOT: (v367-6836689)

[CL 7010060 by richard malo in Main branch]
2019-06-14 16:11:59 -04:00
richard malo
d978c401a8 Back out changelist 6930726
#rnx


#ROBOMERGE-SOURCE: CL 6942002 via CL 6944536
#ROBOMERGE-BOT: (v366-6836689)

[CL 6946900 by richard malo in Main branch]
2019-06-11 23:18:38 -04:00
richard malo
fae021127c - Moved ALandscapeBlueprintCustomBrush in an editor module (also renamed as ALandscapeBlueprintBrush).
- Added runtime base class ALandscapeBlueprintBrushBase. This was done so that landscape blueprints brushes can access editor functions.
#rb patrick.enfedaque
#rnx


#ROBOMERGE-OWNER: richard.malo
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6930726 via CL 6942986
#ROBOMERGE-BOT: (v366-6836689)

[CL 6946114 by richard malo in Main branch]
2019-06-11 21:17:09 -04:00
patrick enfedaque
d6db12af79 - Landscape Layer System:
New Toggles for Affects Height/Weight
Show Brush Stack always
More brush Undo/Redo fixes
New BP Tool Icons

#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 6847988 via CL 6848209
#ROBOMERGE-BOT: (v366-6836689)

[CL 6849056 by patrick enfedaque in Main branch]
2019-06-05 11:09:58 -04:00
patrick enfedaque
d0ad80e65c - Landscape Layer System: BP Brush Fixes
Ability to add an unassigned brush to a layer with right-click add sub menu
 Ability to unassign brush from layer with right-click remove
 Scope the Add Brush Action so that it is properly undoable
 Remove Brush from layer if it is removed from the level
 Remove useless redundant expandable category from Layers and Brushes
 Add Visibility toggle to brushes

[FYI] richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 6837460 via CL 6839899
#ROBOMERGE-BOT: (v366-6836689)

[CL 6840109 by patrick enfedaque in Main branch]
2019-06-04 16:46:59 -04:00
Chris Gagnon
1a3bf5caf1 Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Marc Audy
ab108c215e Copying to Dev-Main @ CL# 4688301
#rb
#rnx

[CL 4688816 by Marc Audy in Main branch]
2019-01-08 11:38:48 -05:00