Commit Graph

289 Commits

Author SHA1 Message Date
richard talbotwatkin
ea65c2ef0f Fix for the "Additional Data" button in the Static Mesh editor, so that the changes are propagated to individual viewports.
#jira UE-91863
#lockdown simon.tourangeau
[FYI] Lauren.Barnes
#rb none

#ROBOMERGE-SOURCE: CL 12759740 in //UE4/Release-4.25/... via CL 12759742 via CL 12784205
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12786506 by richard talbotwatkin in Main branch]
2020-04-14 16:54:46 -04:00
lauren barnes
d928a84195 Copying over 11179103 so that Rset Camera toolbar button will work correctly
#jira UE-87734
#rb trivial

#ROBOMERGE-SOURCE: CL 12232626 in //UE4/Release-4.25/... via CL 12232629
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v664-12234175)

[CL 12234775 by lauren barnes in Main branch]
2020-03-17 15:11:19 -04:00
robert manuszewski
b7568cc694 Fix for UE-90683: You can no longer delete conflicting variables
Refactored FindField into FindUField and FindFProperty to avoid confusion caused by the fact that FindField<UField> will no longer return FProperties.

#jira UE-90683
#rb Steve.Robb
#tests Basic editor functionality test, cooked and ran PC client and server, bot soak tests for two hours

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 12190998 in //UE4/Release-4.25/... via CL 12190999
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12191300 by robert manuszewski in Main branch]
2020-03-15 10:33:45 -04:00
eric soulvie
47f621a216 StaticMeshEditor grid drawing now using EngineShowFlags instead of DrawHelper for grid drawing.
Toolbar grid toggle button now syncs with viewport grid states.  If any viewport is showing a grid, the toggle will be on.
Fixes introduced with when UE-86749 was fixed.
#jira UE-89226
#rb Matt.Kuhlenschmidt


#ushell-cherrypick of 11608356 by Eric.Soulvie

#ROBOMERGE-SOURCE: CL 12156605 in //UE4/Release-4.25/... via CL 12156606
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12156610 by eric soulvie in Main branch]
2020-03-12 18:12:52 -04:00
rex hill
4511728f09 Tab manager filter can now block tab spawn
#rb chris.gagnon


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 11604269 via CL 11604360 via CL 11604439
#ROBOMERGE-BOT: (v656-11643781)

[CL 11743509 by rex hill in Main branch]
2020-02-28 11:30:46 -05:00
matt kuhlenschmidt
0f072073f6 Reworked how realtime is overriden in the editor. This fixes issues where a temporarily set realtime state is saved between editor sessions causing users to be unaware that their viewport is not realtime. Shutting down the editor during PIE or remote desktop were two such cases.
Now there is a separate api on editor viewports to set and remove a temporary override state.  Deprecated existing methods and fixed up use cases.



#ROBOMERGE-OWNER: matt.kuhlenschmidt
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 11498109 via CL 11498156 via CL 11498165
#ROBOMERGE-BOT: (v654-11333218)
#rb none

[CL 11498464 by matt kuhlenschmidt in Main branch]
2020-02-18 09:38:41 -05:00
jamie dale
db9507f916 Fixed localization conflicts
#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11448060 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11448075 by jamie dale in 4.25-Plus branch]
2020-02-14 15:48:32 -05:00
christina tempelaarl
6a467ccc6a Added PhysicalMaterialMasks show flag and visualization in level editor and static mesh editor.
#jira UE-1951
#rb matt.kuhlenschmidt


#ROBOMERGE-SOURCE: CL 11310306 via CL 11310328
#ROBOMERGE-BOT: (v653-11302973)

[CL 11311396 by christina tempelaarl in Main branch]
2020-02-10 16:05:45 -05:00
Chris Gagnon
76c6bcbfeb UE4 Main merged to Dev-Tools-Staging at CL 11164391
#rb none

[CL 11171981 by Chris Gagnon in Dev-Tools-Staging branch]
2020-01-29 20:39:37 -05:00
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
JeanMichel Dignard
84facd6d15 Copy from dev-enterprise cl 11097196
#rb none
#rnx

[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-23 16:28:59 -05: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
jeanmichel dignard
2ce7666d2d Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/...
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v626-10872990)

[CL 10898071 by jeanmichel dignard in Dev-Tools-Staging branch]
2020-01-07 15:54:23 -05:00
julien stjean
6a99255a4d Hot fix for a crash when reseting the import asset data on a static mesh via the static mesh editor.
Removed the ui to reset the asset import data on a static mesh.

#jira UE-85213
#rb Benoit.Deschenes, JeanMichel.Dignard

#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 10882788 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v626-10872990)

[CL 10882802 by julien stjean in Main branch]
2020-01-06 15:00:57 -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
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Chris Gagnon
d1973355bc Merge Dev-Tools-Stagng tp Dev-Editor
#rb none

[CL 9961726 by Chris Gagnon in Dev-Editor branch]
2019-11-01 17:39:56 -04:00
Eric Soulvie
6e297d651f CIS fix #rb none
[CL 9897689 by Eric Soulvie in Dev-Editor branch]
2019-10-30 20:09:58 -04:00
Eric Soulvie
52900e6a3c Moved generation of Layouts menu to SAssetEditoriViewport and moved layouts menu to submenu to match Level Editor
[CL 9897025 by Eric Soulvie in Dev-Editor branch]
2019-10-30 18:26:53 -04:00
richard talbotwatkin
e7c69b38d6 Made UStaticMesh::NavCollision a transactable object when entering the static mesh editor so that Undo is correctly handled.
#jira UE-62002
#rb none

#ROBOMERGE-SOURCE: CL 9846946 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v548-9842178)

[CL 9846947 by richard talbotwatkin in Main branch]
2019-10-27 14:20:06 -04:00
Chris Gagnon
5b7e66b1fb Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) to CL 9544902 for stream reparenting.
#rb none

[CL 9671142 by Chris Gagnon in Dev-Editor branch]
2019-10-17 19:44:57 -04:00
sebastian nordgren
8a0082bf50 Added null check for AssetImportData in FStaticMeshDetails::CustomizeDetails, since it does not need to be set at this point.
#jira UE-81414

#rb paul.chipchase

[CL 9486823 by sebastian nordgren in Dev-Editor branch]
2019-10-09 09:37:51 -04:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
Chris Gagnon
8ab0638182 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24
#rb none

[CL 9325047 by Chris Gagnon in Main branch]
2019-10-01 20:41:42 -04:00