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
fac0b05ba77d025c40134b02027247bec0f4cf18
UnrealEngineUWP/Engine/Source/Editor/MaterialEditor/Private
History
joe conley c5e44d055f 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. 
[FYI] Chris.Bunner, Krzysztof.Narkowicz, Marcus.Wassmer, Yuriy.Odonnell, Matt.Kuhlenschmidt
#rb Krzysztof.Narkowicz

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6308573 via CL 6309266 via CL 6315508
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6348696 by joe conley in Dev-VR branch]
2019-05-07 17:16:40 -04:00
..
Tests
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
FindInMaterial.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialEditingLibrary.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -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-07 17:16:40 -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-07 17:16:40 -04:00
MaterialEditorActions.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialEditorDetailCustomization.cpp
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:23:19 -05:00
MaterialEditorDetailCustomization.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialEditorInstanceDetailCustomization.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-07 17:16:40 -04:00
MaterialEditorInstanceDetailCustomization.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialEditorModule.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialEditorUtilities.cpp
Fixed missing shaders when enabling debug view shader modes in PIE and non cooked game.
2019-03-15 17:07:58 -04:00
MaterialExpressionClasses.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialExpressionClasses.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialInstanceEditor.cpp
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:23:19 -05:00
MaterialInstanceEditor.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialLayersFunctionsCustomization.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialLayersFunctionsCustomization.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialPropertyHelpers.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-03-13 15:19:08 -04:00
MaterialStats.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialStats.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialStatsCommon.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-07 17:16:40 -04:00
MaterialStatsGrid.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MaterialStatsGrid.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialEditorStatsWidget.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialEditorStatsWidget.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialEditorTitleBar.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialEditorTitleBar.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialEditorViewport.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialEditorViewport.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialEditorViewportToolBar.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialEditorViewportToolBar.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialLayersFunctionsTree.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialLayersFunctionsTree.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialPalette.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialPalette.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialParametersOverviewWidget.cpp
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SMaterialParametersOverviewWidget.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00