Merge pull request #8173 from Unity-Technologies/internal/master

Internal/master

Author: claire-nicholson

Packages/com.unity.render-pipelines.core/Editor/LookDev/Context.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using System.Collections.Generic;
 using System.Collections;
+using UnityEngine.Serialization;
 
 namespace UnityEditor.Rendering.LookDev
 {
@@ -334,16 +335,17 @@ public class ViewContext
         // Careful here: we want to keep it while reloading script.
         // But from one unity editor to an other, ID are not kept.
         // So, only use it when reloading from script update.
+        [FormerlySerializedAs("viewedObjecHierarchytInstanceID")]
         [SerializeField]
-        int viewedObjecHierarchytInstanceID;
+        EntityId viewedObjecHierarchytEntityId;
 
         /// <summary>
         /// Check if an Environment is registered for this view.
         /// The result will be accurate even if the object have not been reloaded yet.
         /// </summary>
         public bool hasViewedObject =>
             !String.IsNullOrEmpty(viewedObjectAssetGUID)
-            || viewedObjecHierarchytInstanceID != 0;
+            || viewedObjecHierarchytEntityId != 0;
 
         /// <summary>Reference to the object given for instantiation.</summary>
         public GameObject viewedObjectReference { get; private set; }
@@ -426,14 +428,14 @@ void LoadEnvironmentFromGUID()
         public void UpdateViewedObject(GameObject viewedObject)
         {
             viewedObjectAssetGUID = "";
-            viewedObjecHierarchytInstanceID = 0;
+            viewedObjecHierarchytEntityId = 0;
             viewedObjectReference = null;
             if (viewedObject == null || viewedObject.Equals(null))
                 return;
 
             bool fromHierarchy = viewedObject.scene.IsValid();
             if (fromHierarchy)
-                viewedObjecHierarchytInstanceID = viewedObject.GetInstanceID();
+                viewedObjecHierarchytEntityId = viewedObject.GetInstanceID();
             else
                 viewedObjectAssetGUID = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(viewedObject));
             viewedObjectReference = viewedObject;
@@ -451,9 +453,9 @@ void LoadViewedObject()
                 string path = AssetDatabase.GUIDToAssetPath(viewedObjectAssetGUID);
                 viewedObjectReference = AssetDatabase.LoadAssetAtPath<GameObject>(path);
             }
-            else if (viewedObjecHierarchytInstanceID != 0)
+            else if (viewedObjecHierarchytEntityId != 0)
             {
-                viewedObjectReference = EditorUtility.InstanceIDToObject(viewedObjecHierarchytInstanceID) as GameObject;
+                viewedObjectReference = EditorUtility.EntityIdToObject(viewedObjecHierarchytEntityId) as GameObject;
             }
         }
 
@@ -466,7 +468,7 @@ internal void LoadAll(bool reloadWithTemporaryID)
         }
 
         internal void CleanTemporaryObjectIndexes()
-            => viewedObjecHierarchytInstanceID = 0;
+            => viewedObjecHierarchytEntityId = 0;
 
         /// <summary>Reset the camera state to default values</summary>
         public void ResetCameraState()

Packages/com.unity.render-pipelines.core/Editor/Settings/DefaultVolumeProfileEditor.cs

@@ -130,6 +130,8 @@ bool MatchesSearchString(string title)
                 };
 
                 ListView listView = new ListView(filteredCategoryEditors, -1, makeItem, bindItem);
+                listView.selectionType = SelectionType.None;
+                listView.reorderable = false;
                 listView.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
                 componentListElement.Add(listView);
 

Packages/com.unity.render-pipelines.core/Editor/StyleSheets/DefaultVolumeProfileEditor.uss

@@ -21,3 +21,11 @@
     margin-left: -31px;
     margin-right: -6px;
 }
+
+.unity-imgui-container.unity-list-view__item--selected, .unity-imgui-container.unity-list-view__item:checked{
+    background-color: transparent;
+}
+
+.unity-imgui-container.unity-list-view__item:hover {
+    background-color: var(--unity-colors-highlight-background-hover);
+}

Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentBatcher.cs

@@ -71,7 +71,7 @@ public void UpdateFrame()
             m_BatchersContext.UpdateFrame();
         }
 
-        public void DestroyMaterials(NativeArray<int> destroyedMaterials)
+        public void DestroyMaterials(NativeArray<EntityId> destroyedMaterials)
         {
             m_InstanceCullingBatcher.DestroyMaterials(destroyedMaterials);
         }
@@ -81,12 +81,12 @@ public void DestroyDrawInstances(NativeArray<InstanceHandle> instances)
             m_InstanceCullingBatcher.DestroyDrawInstances(instances);
         }
 
-        public void DestroyMeshes(NativeArray<int> destroyedMeshes)
+        public void DestroyMeshes(NativeArray<EntityId> destroyedMeshes)
         {
             m_InstanceCullingBatcher.DestroyMeshes(destroyedMeshes);
         }
 
-        internal void FreeRendererGroupInstances(NativeArray<int> rendererGroupIDs)
+        internal void FreeRendererGroupInstances(NativeArray<EntityId> rendererGroupIDs)
         {
             if (rendererGroupIDs.Length == 0)
                 return;
@@ -115,7 +115,7 @@ public void UpdateInstanceOccluders(RenderGraph renderGraph, in OccluderParamete
             m_BatchersContext.occlusionCullingCommon.UpdateInstanceOccluders(renderGraph, occluderParams, occluderSubviewUpdates);
         }
 
-        public void UpdateRenderers(NativeArray<int> renderersID, bool materialUpdateOnly = false)
+        public void UpdateRenderers(NativeArray<EntityId> renderersID, bool materialUpdateOnly = false)
         {
             if (renderersID.Length == 0)
                 return;
@@ -127,7 +127,7 @@ public void UpdateRenderers(NativeArray<int> renderersID, bool materialUpdateOnl
         }
 
 #if UNITY_EDITOR
-        public void UpdateSelectedRenderers(NativeArray<int> renderersID)
+        public void UpdateSelectedRenderers(NativeArray<EntityId> renderersID)
         {
             var instances = new NativeArray<InstanceHandle>(renderersID.Length, Allocator.TempJob, NativeArrayOptions.UninitializedMemory);
             m_BatchersContext.ScheduleQueryRendererGroupInstancesJob(renderersID, instances).Complete();
@@ -136,7 +136,7 @@ public void UpdateSelectedRenderers(NativeArray<int> renderersID)
         }
 #endif
 
-        public JobHandle SchedulePackedMaterialCacheUpdate(NativeArray<int> materialIDs,
+        public JobHandle SchedulePackedMaterialCacheUpdate(NativeArray<EntityId> materialIDs,
             NativeArray<GPUDrivenPackedMaterialData> packedMaterialDatas)
         {
             return m_InstanceCullingBatcher.SchedulePackedMaterialCacheUpdate(materialIDs, packedMaterialDatas);