Merge branch 'main' into new-effects-work

This commit is contained in:
Matt F 2026-06-30 22:31:52 -07:00
commit 4f21f8a99b
25 changed files with 451 additions and 226 deletions

View file

@ -155,11 +155,6 @@
"type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.dragSelectRectMode",
"value": "{\"m_Value\":0}"
},
{
"type": "UnityEditor.ProBuilder.Actions.ExportAssetOptions, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "export.assetOptions",
"value": "{\"m_Value\":{\"makePrefab\":false,\"replaceOriginal\":false}}"
}
]
}