Merge branch 'main' of https://github.com/Netherlands3D/twin into fea…

…ture/save-files-with-the-same-name-2 # Conflicts: # Assets/Scripts/Layers/Adapters/DataTypeAdapters/GeoJSONImportAdapter.cs: Used theirs
Netherlands3D · Oct 21, 2024 · 68695b4 · 68695b4
2 parents 86358ea + 6b99ffd
commit 68695b4
Show file tree

Hide file tree

Showing 195 changed files with 183 additions and 2,165 deletions.
diff --git a/...tagingArea/ExampleMunicipality/Runtime/ScriptableObjects/Events/ToggleAreaSelection.asset b/...tagingArea/ExampleMunicipality/Runtime/ScriptableObjects/Events/ToggleAreaSelection.asset
diff --git a/...gArea/ExampleMunicipality/Runtime/ScriptableObjects/Events/ToggleAreaSelection.asset.meta b/...gArea/ExampleMunicipality/Runtime/ScriptableObjects/Events/ToggleAreaSelection.asset.meta
diff --git a/...kageStagingArea/ExampleMunicipality/Runtime/Textures/UI/Icons/AreaSelection.png b/...kageStagingArea/ExampleMunicipality/Runtime/Textures/UI/Icons/AreaSelection.png
diff --git a/...s/PackageStagingArea/ExampleMunicipality/Runtime/Textures/UI/Icons/AreaSelection.png.meta b/...s/PackageStagingArea/ExampleMunicipality/Runtime/Textures/UI/Icons/AreaSelection.png.meta
diff --git a/Assets/PackageStagingArea/Rendering/Runtime/Scripts/Projectors/TextureDecalProjector.cs b/Assets/PackageStagingArea/Rendering/Runtime/Scripts/Projectors/TextureDecalProjector.cs
@@ -34,7 +34,6 @@ public override void SetSize(Vector3 size)
         public override void SetTexture(Texture2D texture)
         {
             base.SetTexture(texture);
-
             if (!materialInstance)
             {
                 materialInstance = new Material(projector.material);

diff --git a/Assets/PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection.meta b/Assets/PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection.meta
diff --git a/Assets/PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection/GotBoundingBox.asset b/Assets/PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection/GotBoundingBox.asset
diff --git a/.../PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection/GotBoundingBox.asset.meta b/.../PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection/GotBoundingBox.asset.meta
diff --git a/Assets/PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection/SelectedArea.asset b/Assets/PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection/SelectedArea.asset
diff --git a/...ts/PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection/SelectedArea.asset.meta b/...ts/PackageStagingArea/SelectionTools/Runtime/Events/AreaSelection/SelectedArea.asset.meta