Merge pull request #12443 from iwubcode/custom_pipeline_action_material_cubemap

VideoCommon: update custom pipeline action to support a variety of texture samplers, support for materials, and more!

1 files changed, 2 insertions, 0 deletions

diff --git a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
index 9a749ecec9..ff20d117c2 100644
--- a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
+++ b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
@@ -13,6 +13,7 @@
 #include "VideoCommon/Assets/MaterialAsset.h"
 #include "VideoCommon/Assets/ShaderAsset.h"
 #include "VideoCommon/Assets/TextureAsset.h"
+#include "VideoCommon/RenderState.h"
 
 namespace VideoCommon
 {
@@ -289,6 +290,7 @@ CustomAssetLibrary::LoadInfo DirectFilesystemAssetLibrary::LoadTexture(const Ass
   }
   else
   {
+    data->m_sampler = RenderState::GetLinearSamplerState();
     data->m_type = TextureData::Type::Type_Texture2D;
   }