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
Files
7740cd138b98b4e3eec345e3491c19c9afa6ce61
UnrealEngineUWP/Engine/Source/Editor/MaterialEditor/Private
History
kevin ortegren 6e18da20a8 Now treating the subsurface profile override like the other material override poroperties in the Material Instance editor UI 
#rb none
[FYI] Lauren.Ridge

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6629070 via CL 6632166 via CL 6632349
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6749414 by kevin ortegren in Dev-Anim branch]
2019-05-31 18:10:20 -04:00
..
Tests
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
FindInMaterial.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialEditingLibrary.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4708558
2019-01-11 07:37:39 -05:00
MaterialEditor.cpp
Adds support for multiple shading models per material. Each material now has a bit field of which shading models it is using. Shading models for a material are selected through a new Shading Model material expression, which can be connected to the new Shading Model material output pin. This is opt-in by selecting "From Material Expression" in the Shading Model drop down on the material. With no changes, everything should behave like before, and the old workflow is still there. Optimized shader code should be as performant as before if not using more than one shading model.
2019-05-06 17:02:17 -04:00
MaterialEditor.h
Adds support for multiple shading models per material. Each material now has a bit field of which shading models it is using. Shading models for a material are selected through a new Shading Model material expression, which can be connected to the new Shading Model material output pin. This is opt-in by selecting "From Material Expression" in the Shading Model drop down on the material. With no changes, everything should behave like before, and the old workflow is still there. Optimized shader code should be as performant as before if not using more than one shading model.
2019-05-06 17:02:17 -04:00
MaterialEditorActions.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialEditorDetailCustomization.cpp
Some UI improvements to matrerial scalar/vector parameters when using the custom primitive data.
2019-05-31 14:31:32 -04:00
MaterialEditorDetailCustomization.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialEditorInstanceDetailCustomization.cpp
Now treating the subsurface profile override like the other material override poroperties in the Material Instance editor UI
2019-05-31 18:10:20 -04:00
MaterialEditorInstanceDetailCustomization.h
Now treating the subsurface profile override like the other material override poroperties in the Material Instance editor UI
2019-05-31 18:10:20 -04:00
MaterialEditorModule.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialEditorUtilities.cpp
Fixed missing shaders when enabling debug view shader modes in PIE and non cooked game.
2019-03-15 17:07:34 -04:00
MaterialExpressionClasses.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialExpressionClasses.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialInstanceEditor.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
2019-02-06 14:35:56 -05:00
MaterialInstanceEditor.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialLayersFunctionsCustomization.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialLayersFunctionsCustomization.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialPropertyHelpers.cpp
Adding a parameter's source function or material to its tooltip
2019-03-13 09:41:41 -04:00
MaterialStats.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialStats.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialStatsCommon.cpp
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-05-31 18:06:13 -04:00
MaterialStatsGrid.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
MaterialStatsGrid.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialEditorStatsWidget.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialEditorStatsWidget.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialEditorTitleBar.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialEditorTitleBar.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialEditorViewport.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791
2019-01-11 04:11:30 -05:00
SMaterialEditorViewport.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791
2019-01-11 04:11:30 -05:00
SMaterialEditorViewportToolBar.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialEditorViewportToolBar.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialLayersFunctionsTree.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4683693
2019-01-07 05:38:46 -05:00
SMaterialLayersFunctionsTree.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4683693
2019-01-07 05:38:46 -05:00
SMaterialPalette.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialPalette.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
2018-12-17 06:31:16 -05:00
SMaterialParametersOverviewWidget.cpp
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4683693
2019-01-07 05:38:46 -05:00
SMaterialParametersOverviewWidget.h
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4683693
2019-01-07 05:38:46 -05:00