izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
180,637 Commits 23 Branches 254 Tags
e59338fcbb052d40802ffaf991924b2aebf04341
Commit Graph

42 Commits

Author SHA1 Message Date
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298 
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
 2021-11-18 14:37:34 -05:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test 
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
 2021-09-06 12:23:53 -04:00
ben ingram
14b02e485d Modifying a material function will continue to recompile all materials that depend on that function, but the materials will no longer be marked dirty 
This is fine, because materials will refresh the stateID of any dependent MF when loaded, and use updated stateIDs to form the ShaderMapID
#rb arciel.rekman, jason.nadro
#preflight 6125576daf9a8f0001510587

#ROBOMERGE-SOURCE: CL 17294061 via CL 17294075
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v861-17282326)

[CL 17294091 by ben ingram in ue5-release-engine-test branch]
 2021-08-24 17:29:44 -04:00
ben ingram
66be2e976f When material function changes, update all dependent function instances, and all material instances that use any of those function (instances) 
#rb none

#ROBOMERGE-SOURCE: CL 16886264 via CL 16913628
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16913842 by ben ingram in ue5-release-engine-test branch]
 2021-07-21 15:23:35 -04:00
peter knepley
7b7c9057f9 Work around in UMaterialEditingLibrary::SetMaterialInstanceStaticSwitchParameterValue when MICs are generated programmatically and have never been opened by the editor. MaterialLayersParameters not being on the MIC can cause static switches to get wiped when it is eventually opened. 
[FYI] David.Corral

#ROBOMERGE-SOURCE: CL 16635492 via CL 16635514
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v831-16623017)

[CL 16635527 by peter knepley in ue5-release-engine-test branch]
 2021-06-10 22:36:36 -04:00
peter knepley
51b6460a2f UMaterialEditingLibrary support for setting static switches 
[FYI] Matt.Kulhenschmidt, David.Corral


#ROBOMERGE-SOURCE: CL 16581322
#ROBOMERGE-BOT: (v828-16531559)

[CL 16581326 by peter knepley in ue5-main branch]
 2021-06-07 20:30:36 -04:00
peter knepley
3952c1207e Extend UMaterialEditingLibrary to allow settings values of material layer parameters 
[FYI] Matt.Kuhlenschmidt, David.Corral


#ROBOMERGE-SOURCE: CL 16579451
#ROBOMERGE-BOT: (v828-16531559)

[CL 16579467 by peter knepley in ue5-main branch]
 2021-06-07 18:55:54 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main 
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
 2021-04-29 19:32:06 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main 
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
 2021-02-03 14:57:28 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662 
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
 2020-10-22 19:19:16 -04:00
daren cheng
0e796eb369 Add grouping to material graph. 
Add composite & pinbase expressions / nodes, which use reroutes under the hood to ensure zero material overhead.
Convert MaterialEditor to a WorkflowCentricApplication.
Generally add subgraph existence support to MaterialGraph / MaterialEditor.

#jira UE-96104
#rb Ben.Ingram Lauren.Barnes
#fyi Lauren.Barnes

[CL 14437968 by daren cheng in ue5-main branch]
 2020-10-07 10:35:24 -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
jonathan bard
daa9259268 Fixed crash when updating a material function used by a MID currently being edited 
[REVIEW] ben.ingram
#jira UE-92082

#ROBOMERGE-SOURCE: CL 12917010 via CL 12917012 via CL 12917015
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12917018 by jonathan bard in Main branch]
 2020-04-20 05:49:35 -04:00
ben ingram
8fd50034e8 #jira UE-82636 
When deciding what to recompile after chaning a MF, look at all MIs, instead of stopping after finding the first match
#rb none

#ROBOMERGE-SOURCE: CL 11792752 in //UE4/Release-4.25/... via CL 11792883
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11792961 by ben ingram in Main branch]
 2020-02-28 20:20:41 -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
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
uriel doyon
fbeabd378c Removed unrequired shader compilation when changing preview feature level. 
Texture streaming accuracy visualization now show the current state of data, and doesn't need to build the texture streaming as a prestep.
#rb alexis.matte
#jira UE-76859

#ROBOMERGE-SOURCE: CL 7223779 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7223780 by uriel doyon in Main branch]
 2019-07-04 13:00:49 -04:00
lauren ridge
eca34bf106 Adding Material Editing Library script-callable functions to find the source of parameters (ie did they originate in the material itself or a nested function) 
#jira UE-75211
#rb Rex.Hill
#rnx


#ROBOMERGE-SOURCE: CL 6894712 via CL 6903914
#ROBOMERGE-BOT: (v366-6836689)

[CL 6904062 by lauren ridge in Main branch]
 2019-06-08 23:02:09 -04:00
lauren ridge
55ba4f6f2e Adding getters for the material parameter names to the Material Editing Library 
#jira UE-75716
#rb Jason.Stasik
#rnx


#ROBOMERGE-SOURCE: CL 6867297 via CL 6868764
#ROBOMERGE-BOT: (v366-6836689)

[CL 6868826 by lauren ridge in Main branch]
 2019-06-06 17:47:54 -04:00
lauren ridge
e685c6e559 Adding hierarchy button to material editor toolbar to show material instances and added children to material instance editor hierarchy dropdown 
#jira UE-51194
#rb Chris.Gagnon
#rnx


#ROBOMERGE-SOURCE: CL 6861488 via CL 6863501
#ROBOMERGE-BOT: (v366-6836689)

[CL 6864511 by lauren ridge in Main branch]
 2019-06-06 14:23:02 -04:00
lauren ridge
743db79b8e Adding a function to the Material Editing Library to get children of any material or material instance. 
#jira UE-75211
#rb Rex.Hill
#rnx


#ROBOMERGE-SOURCE: CL 6853079 via CL 6854143
#ROBOMERGE-BOT: (v366-6836689)

[CL 6854160 by lauren ridge in Main branch]
 2019-06-05 15:16:21 -04:00
lauren ridge
9cfc46b1f6 Adding functionality to MaterialEditingLibrary. Get Static Switch Parameter Value, plus matching Get X Parameter Value functions for Materials (for scalar, vector, texture, and static switch). Also added a getter to check material usage flags. 
#jira UE-75211
#rb Alexander.Sanoja
#rnx


#ROBOMERGE-SOURCE: CL 6837755 via CL 6840221
#ROBOMERGE-BOT: (v366-6836689)

[CL 6841288 by lauren ridge in Main branch]
 2019-06-04 18:26:36 -04:00
Chris Gagnon
1dd3e0189f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) 
#rb none

[CL 4730305 by Chris Gagnon in Dev-Editor branch]
 2019-01-15 18:47:22 -05:00