Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging

5 months ago · d1dc0055cd
2 changed files with 9 additions and 0 deletions
--- a/Packages/com.unity.animation.rigging/Runtime/AnimationRig/RigBuilder.cs
+++ b/Packages/com.unity.animation.rigging/Runtime/AnimationRig/RigBuilder.cs
@ -12,6 +12,7 @@ namespace UnityEngine.Animations.Rigging
    [RequireComponent(typeof(Animator))]
    [DisallowMultipleComponent, ExecuteInEditMode, AddComponentMenu("Animation Rigging/Setup/Rig Builder")]
    [HelpURL("https://docs.unity3d.com/Packages/com.unity.animation.rigging@1.3/manual/RiggingWorkflow.html#rig-builder-component")]
+    [DefaultExecutionOrder(9999)]
    public class RigBuilder : MonoBehaviour, IAnimationWindowPreview, IRigEffectorHolder
    {
        [SerializeField] private List<RigLayer> m_RigLayers;
--- a/Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents.meta
+++ b/Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d7a8435b968e9714c9ea91e7101c3e03
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: