chore: update shader override name

readyplayerme · Jan 12, 2024 · a6604de · a6604de
1 parent 596941a
commit a6604de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Editor/Core/Scripts/UI/CustomEditors/AvatarConfigEditor.cs b/Editor/Core/Scripts/UI/CustomEditors/AvatarConfigEditor.cs
@@ -134,7 +134,7 @@ private void SetupCompressionPackages()
                 useDracoCompression.SetValueWithoutNotify(ModuleInstaller.IsModuleInstalled(ModuleList.DracoCompression.name));
                 useMeshOptCompression.SetValueWithoutNotify(PackageManagerHelper.IsPackageInstalled(MESH_OPT_PACKAGE_NAME));
             });
-            
+
             useDracoCompression.RegisterValueChangedCallback(x =>
                 {
                     avatarConfigTarget.UseDracoCompression = x.newValue;
@@ -160,7 +160,7 @@ private void SetupCompressionPackages()
                     Save();
                 }
             );
-          
+
             useMeshOptCompression.RegisterValueChangedCallback(x =>
                 {
                     avatarConfigTarget.UseMeshOptCompression = x.newValue;
@@ -245,7 +245,7 @@ void BindItem(VisualElement e, int i)
 
         private void SetupShader()
         {
-            var shader = root.Q<ObjectField>("Shader");
+            var shader = root.Q<ObjectField>("ShaderOverride");
             shader.SetValueWithoutNotify(avatarConfigTarget.Shader);
 
             var shaderPropertiesContainer = root.Q<VisualElement>("ShaderProperties");

diff --git a/Editor/Core/Scripts/UI/CustomEditors/AvatarConfigEditor.uxml b/Editor/Core/Scripts/UI/CustomEditors/AvatarConfigEditor.uxml
@@ -8,7 +8,7 @@
         <ui:ListView focusable="true" reorderable="true" show-border="true" show-alternating-row-backgrounds="All" style="height: auto; flex-shrink: 0; flex-grow: 0; justify-content: flex-start; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px;" />
     </ui:Foldout>
     <ui:VisualElement name="CustomShader" style="border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgba(113, 109, 109, 255); border-right-color: rgba(113, 109, 109, 255); border-top-color: rgba(113, 109, 109, 255); border-bottom-color: rgba(113, 109, 109, 255);">
-        <uie:ObjectField label="Shader" type="UnityEngine.Shader, UnityEngine.CoreModule" name="Shader" />
+        <uie:ObjectField label="Shader Override" type="UnityEngine.Shader, UnityEngine.CoreModule" name="ShaderOverride" />
         <ui:VisualElement name="ShaderProperties" style="flex-grow: 1; margin-left: 5px;" />
     </ui:VisualElement>
     <ui:Foldout text="Optimization Packages" name="OptimizationPackages" value="false" style="flex-shrink: 0; margin-top: 4px; margin-left: 4px; margin-right: 4px;">