Commit Graph

131 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alexis Matte
371046019b Make the reduction backup section more robust
#jira UE-80880
#rb none
#rnx
#lockdown chris.gagnon

[CL 9289409 by Alexis Matte in Dev-Editor branch]
2019-09-29 11:33:27 -04:00
Alexis Matte
306251d5f7 Skeletal mesh build refactor, the skeletal mesh now have the capability to be rebuild without reimport like the staticmesh.
Copying //UE4/Dev-Editor-SKBuildRefactor to Dev-Editor (//UE4/Dev-Editor)
#rb none
#jira UE-69881

[CL 9114926 by Alexis Matte in Dev-Editor branch]
2019-09-25 18:08:21 -04:00
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -04:00
Max Chen
61603c83e4 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL#8390086
#rb none

[CL 8393238 by Max Chen in Dev-Editor branch]
2019-09-01 02:03:35 -04:00
Alexis Matte
907a88c608 Add an option to allow compute normals to use weight by area and angle.
#jira UE-79195
#rb jimmy.andrews
#rn Add an fbx option to allow compute normals to use weight by area and angle for both staticmesh and skeletalmesh. Add also a staticmesh build options for the feature.

[CL 8364158 by Alexis Matte in Dev-Editor branch]
2019-08-28 15:15:21 -04:00
Alexis Matte
41e6e2a3ed Modify the asset picker filtering to pass an array of FAssetData has aditionnal references for the filtering
#jira UE-79221

#rb Bob.Tellez
[FYI] lauren.ridge; Chris.Gagnon


#ROBOMERGE-OWNER: Alexis.Matte
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 8213393 via CL 8226984
#ROBOMERGE-BOT: (v401-8057353)

[CL 8227335 by Alexis Matte in Main branch]
2019-08-23 11:04:51 -04:00
Lauren Ridge
22440a222e Added missing property handle information
#rb existingCL
#jira UE-78615
#rnx

[CL 7932646 by Lauren Ridge in Main branch]
2019-08-09 11:09:51 -04:00
lauren ridge
0e1a020e1a Redoing fix to pass in a property handle to help filter materials in the static mesh editor
#jira UE-77330
#rb none
[FYI] Bob.Tellez
#rnx


#ROBOMERGE-SOURCE: CL 7887839 via CL 7916252
#ROBOMERGE-BOT: (v389-7813075)

[CL 7916437 by lauren ridge in Main branch]
2019-08-08 23:46:38 -04:00
richard talbotwatkin
c0ef3053d2 Deprecated direct access to UStaticMesh::SourceModels, SectionInfoMap and OriginalSectionInfoMap.
Added new accessors for getting individual SourceModels, or the entire array.
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 7668562 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7668565 by richard talbotwatkin in Main branch]
2019-07-31 03:40:45 -04:00
richard talbotwatkin
5e9c7fc093 Fixed serialization / versioning issue with MeshDescription, and fixed unnecessary memory bloat by not retaining MeshDescriptionBulkData which is generated to be written to the DDC when a legacy static mesh is first loaded. This goes alongside CL 7248033
#jira UE-76666
#rb Alexis.Matte

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

[CL 7265475 by richard talbotwatkin in Main branch]
2019-07-10 14:49:18 -04:00
JeanMichel Dignard
0f9ad96858 Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden
#rb none

[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -04:00
Lina Halper
b0bdc590d5 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#lockdown: thomas.sarkanen
#fyi: Laurent.Delayen
#rb: none

[CL 6861656 by Lina Halper in Dev-Anim branch]
2019-06-06 12:33:54 -04:00
stefan boberg
7f1f94b842 Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: stefan.boberg
#ROBOMERGE-SOURCE: CL 6815521 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6821478 by stefan boberg in Dev-Anim branch]
2019-06-03 19:17:40 -04:00