浏览代码

Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests

/namespace
Remy 7 年前
当前提交
b284a234
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2
      Tests/GraphicsTests/Framework/Editor/TestFramework.cs
  2. 6
      Tests/GraphicsTests/Framework/SetupSceneForRenderPipelineTest.cs

2
Tests/GraphicsTests/Framework/Editor/TestFramework.cs


{
get
{
return GetScenesForPipeline("HDRenderPipeline");
return GetScenesForPipeline("HDRenderPipeline/Scenes");
}
}

6
Tests/GraphicsTests/Framework/SetupSceneForRenderPipelineTest.cs


using UnityEngine.Rendering;
using UnityEngine.Rendering;
namespace UnityEngine.Experimental.Rendering
{

public void Setup()
{
m_OriginalAsset = GraphicsSettings.renderPipelineAsset;
GraphicsSettings.renderPipelineAsset = renderPipeline;
if (m_OriginalAsset != renderPipeline) GraphicsSettings.renderPipelineAsset = renderPipeline;
GraphicsSettings.renderPipelineAsset = m_OriginalAsset;
if ( GraphicsSettings.renderPipelineAsset != m_OriginalAsset ) GraphicsSettings.renderPipelineAsset = m_OriginalAsset;
}
}
}
正在加载...
取消
保存