浏览代码

Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature

/iridesence
sebastienlagarde 7 年前
当前提交
a49f38be
共有 3 个文件被更改,包括 4 次插入2 次删除
  1. 1
      ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
  2. 3
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Decal/DecalMenuItems.cs
  3. 2
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/HDRenderPipelineMenuItems.cs

1
ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs


public const int editMenuPriority2 = 331;
public const int assetCreateMenuPriority1 = 230;
public const int assetCreateMenuPriority2 = 241;
public const int gameObjectMenuPriority = 10;
static Cubemap m_BlackCubeTexture;
public static Cubemap blackCubeTexture

3
ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Decal/DecalMenuItems.cs


using System.IO;
using UnityEngine;
using UnityEngine.Experimental.Rendering;
using UnityEngine.Experimental.Rendering.HDPipeline;
namespace UnityEditor.Experimental.Rendering.HDPipeline

[MenuItem("GameObject/Render Pipeline/High Definition/DecalProjector", false, 0)]
[MenuItem("GameObject/Render Pipeline/High Definition/DecalProjector", priority = CoreUtils.gameObjectMenuPriority)]
static void CreateDecal(MenuCommand menuCommand)
{
// Create a custom game object

2
ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/HDRenderPipelineMenuItems.cs


}
}
[MenuItem("GameObject/Render Pipeline/High Definition/Scene Settings", priority = 10)]
[MenuItem("GameObject/Render Pipeline/High Definition/Scene Settings", priority = CoreUtils.gameObjectMenuPriority)]
static void CreateCustomGameObject(MenuCommand menuCommand)
{
var sceneSettings = new GameObject("Scene Settings");

正在加载...
取消
保存