Lauren Barnes
6248f8d412
Replacing legacy EditorStyle calls with AppStyle
...
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt
#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf
[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
roey borsteinas
52b36350f8
Renamed SEnumCombobox.h to SEnumCombo.h to remove capialization issue
...
#rb none
#jira none
[CL 15069767 by roey borsteinas in ue5-main branch]
2021-01-13 13:58:36 -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
benoit deschenes
8949357939
Integrating CL#11313264 from Dev-Enterprise
...
Fixing Fbx import option "Material Search Location" sometimes being ignored.
#jira UE-77360
#rb Alexis.Matte
#ROBOMERGE-SOURCE: CL 11461543 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)
[CL 11461547 by benoit deschenes in 4.25-Plus branch]
2020-02-17 13:34:27 -05:00
Alexis Matte
ffe1c8dc8e
Add opacity texture to FBX material instance import. When importing an FBX, you have the option to import materials as instances off of a base material, as opposed to creating new material graphs for each FBX material. This change adds the option to import anything connected to the TransparencyColor.
...
#jira none
#rb JeanMichel.Dignard
[CL 11190216 by Alexis Matte in Main branch]
2020-01-30 20:08:54 -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
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
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
Alexis Matte
262eabda3e
Add option to control if the material can be reorder to the fbx file material order
...
#jira UE-67819
#rb none
[CL 5069041 by Alexis Matte in Dev-Editor branch]
2019-02-19 15:51:28 -05:00
Chris Gagnon
0dbe1f7fb2
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4766091 by Chris Gagnon in Dev-Editor branch]
2019-01-21 17:47:02 -05: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
Alexis Matte
64260f39e8
Make sure the font use in the import material method combobox is the good one
...
#jira UE-67453
#rb none
[CL 4683784 by Alexis Matte in Dev-Editor branch]
2019-01-05 13:35:04 -05:00
Alexis Matte
241c859951
Polish fbx material import options
...
#jira UE-67453
#rb none
[CL 4683718 by Alexis Matte in Dev-Editor branch]
2019-01-05 09:41:32 -05:00
Alexis Matte
5bd38ba0e5
In fbx import option, add a "Do Not Override" string when base material is override.
...
#jira UE-67985
#rb none
[CL 4681717 by Alexis Matte in Dev-Editor branch]
2019-01-04 11:43:36 -05:00
Alexis Matte
e306442450
Fix a misspell word in the fbx importer options dialog.
...
#jira UE-67455
#rb none
[CL 4679146 by Alexis Matte in Dev-Editor branch]
2019-01-03 13:31:50 -05:00
Alexis Matte
26d4ff1d4a
Prevent showing empty drop down in the material base options of the fbx import dialog.
...
#jira UE-67285
#rb none
[CL 4678744 by Alexis Matte in Dev-Editor branch]
2019-01-03 11:46:17 -05:00
Alexis Matte
3ec6be8cc5
Fbx importer: Hide the properties that are not supported when reimporting.
...
#jira UE-66689
#rb none
[CL 4678424 by Alexis Matte in Dev-Editor branch]
2019-01-03 10:39:35 -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
Alexis Matte
821bb70160
Add import vertex color options to skeletalmesh
...
#rb none
#jira UE-51547
[CL 4624417 by Alexis Matte in Dev-Editor branch]
2018-12-03 14:02:04 -05:00
Matt Kuhlenschmidt
0c387a28a1
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4395683 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-09-25 13:44:09 -04:00
Marc Audy
af90b7bcd4
Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
...
#rb
#rnx
#lockdown Nick.Penwarden
[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00
Alexis Matte
88b8c49ff8
Fix CIS static analysis warning
...
#rb none
#jira none
[CL 4340444 by Alexis Matte in Dev-Editor branch]
2018-09-04 09:13:54 -04:00
Alexis Matte
50995874cb
Make sure the re-import dialog hide the lod settings, since these options are not use by the re-import.
...
Make sure the LODSettings are hide when the import LODs check box is unchecked
#rb none
#jira UE-62375
#jira UE-62414
[CL 4336471 by Alexis Matte in Dev-Editor branch]
2018-08-31 11:11:18 -04:00
Alexis Matte
eb8d46ba06
Fix fbx import dialog inputs
...
#rb none
#jira UE-62378
[CL 4336322 by Alexis Matte in Dev-Editor branch]
2018-08-31 10:31:39 -04:00
