Commit Graph

247 Commits

Author SHA1 Message Date
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
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
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
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
simon tourangeau
5ecedcab2d Path Selection Window
When user selects target path for exporting or saving, we need to refresh content from server. So we add OnPathSelected event to FSharedAssetDialogConfig and SAssetDialog.
Changed files: IContentBrowserSingleton.h, SAssetDialog.h, SAssetDialog.cpp.

GPumpingMessages
When files and folders are deleted or created by user, we want to save these changes to server. So we monitor such changes through IAssetRegistry. But we need to determine whether it�s triggered by user. So we add GPumpingMessages, a global flag indicating that application is processing Windows messages. Which means it�s triggered by user input.
Another possible choice is adding delegates. But this requires more changes and is less general.
Changed files: CoreGlobals.h, CoreGlobals.cpp, WindowsPlatformApplicationMisc.cpp.

Mesh Editor Small Fix
Fix an issue where vertex colors in Toolbar didn't work in 4.22.
Changed file is SStaticMeshEditorViewport.cpp.

#jira UE-78897

PR #6121: Editor changes for NVIDIA USD plugin

#rb chris.gagnon
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8042071 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v399-8035122)

[CL 8042138 by simon tourangeau in Main branch]
2019-08-14 16:18:58 -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
jack porter
a913c14fcc Apply platform scalability settings when changing Preview Rendering Level
#rb Allan.Bentham


[CODEREVIEW] Jack.Porter, Rolando.Caloca, Josh.Adams


#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 7306462 via CL 7315035
#ROBOMERGE-BOT: (v371-7306989)

[CL 7318233 by jack porter in Main branch]
2019-07-16 01:31:34 -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
patrick enfedaque
7d37702c19 Fix Build (missing header reported in //UE4/main)
[FYI] satchit.subramanian
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6594649 via CL 6594653 via CL 6595132 via CL 6595180
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v363-6677109)

[CL 6705853 by patrick enfedaque in Dev-Anim branch]
2019-05-31 13:32:04 -04:00
satchit subramanian
75aae3ff94 Option to specify static mesh complex collision from a different asset.
#rb Michael.Lentine

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: satchit.subramanian
#ROBOMERGE-SOURCE: CL 6585699 via CL 6590545 via CL 6592497 via CL 6592611
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v363-6677109)

[CL 6702953 by satchit subramanian in Dev-Anim branch]
2019-05-31 13:10:53 -04:00
Thomas Sarkanen
c012e3ded8 Improved layout and appearance of per-platform overrides widget
Also fixed enabled/disabled state when used in static mesh editor.
Also moved layout widget into cpp file & updated dependencies and includes for IWYU.

#jira UE-67159 - Screen Size platform override spinboxes should wrap based on window size
#jira UE-74089 - AltSkinWeights - Profile and LODIndex override options can overlap the Default options when the Asset Details panel is crunched
#rb Jurre.deBaare

[CL 6544214 by Thomas Sarkanen in Dev-Anim branch]
2019-05-17 08:58:49 -04:00
Cody Albert
e448f7cdf4 Updated BodyInstanceCustomization to notify when collision is set back to default so we can update collision visualizations
Updated Static Mesh Editor to refresh collision visualization on instances when source mesh collision profile is changed

#jira UE-70727
#rb matt.kuhlenschmidt

[CL 5288462 by Cody Albert in Dev-Editor branch]
2019-03-04 15:30:36 -05:00
Thomas Sarkanen
474bc576ee Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 5236305
#rb none
#jira none

[CL 5236785 by Thomas Sarkanen in Dev-Anim branch]
2019-02-28 04:41:36 -05:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
lauren ridge
c21d248ec9 Fix for LOD radio button not updating static mesh editor viewport
#jira UE-70134
#rb trivial

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 5010058 in //UE4/Release-4.22/... via CL 5010061
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5047585 by lauren ridge in Dev-Anim branch]
2019-02-18 15:29:52 -05:00
jian ru
e0b10df133 Fix a potential data race when changing UStaticMesh::NumStreamedLODs through editor
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jian.ru
#ROBOMERGE-SOURCE: CL 4917342 via CL 4918935 via CL 4920344
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5018019 by jian ru in Dev-Anim branch]
2019-02-16 01:30:09 -05:00
jian ru
ca0d7005f7 Resolve robomerge conflicts
#jira none
#rb none
[FYI] chris.bunner, jeff.williams

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jian.ru
#ROBOMERGE-SOURCE: CL 4920023 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5017863 by jian ru in Dev-Anim branch]
2019-02-16 01:27:45 -05:00
Lina Halper
f7baa58bc9 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#fyi: Laurent.Delayen, James.Hopkin
#rb: none

[CL 4923303 by Lina Halper in Dev-Anim branch]
2019-02-06 14:35:56 -05:00
Alexis Matte
be841a6299 Prevent log spam from adjacency required by some material feature. (force the option to true in that case)
#jira UE-68368
#rb none

[CL 4753580 by Alexis Matte in Dev-Editor branch]
2019-01-18 14:18:58 -05:00