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

Browse Source

# Conflicts:
#	Flax.flaxproj
#	Source/Editor/Content/Items/AssetItem.cs

...

This commit is contained in:

Wojtek Figat

2023-06-13 15:41:07 +02:00

parent 534d2388f5 55971167c8

commit 8f7da81621

19 changed files with 175 additions and 98 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/AtmospherePreCompute.flax (Stored with Git LFS)

Binary file not shown.