Merge remote-tracking branch 'origin/master' into 1.9

Browse Source

# Conflicts:
#	Source/Editor/Modules/ContentDatabaseModule.cs
#	Source/Editor/Surface/SurfaceUtils.cs
#	Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
#	Source/Engine/Foliage/Foliage.cpp
#	Source/Engine/Graphics/Models/MeshBase.h
#	Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp

...

This commit is contained in:

Wojtek Figat

2024-09-12 13:38:20 +02:00

parent 6a4d9877e6 e0a488dec1

commit 9daddccbed

111 changed files with 1717 additions and 511 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Content/Shaders/ColorGrading.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Editor/LightmapUVsDensity.flax (Stored with Git LFS)

Binary file not shown.