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

2023-07-18 18:35:44 +02:00
parent e39a56fc4e b2b10ce7da
commit eea0b37dc3
21 changed files with 56 additions and 63 deletions
--- a/Source/Editor/Tools/Foliage/FoliageTools.cpp
+++ b/Source/Editor/Tools/Foliage/FoliageTools.cpp
@@ -292,7 +292,6 @@ void FoliageTools::Paint(Foliage* foliage, Span<int32> foliageTypesIndices, cons
    {
        PROFILE_CPU_NAMED("Place Instances");

-        Matrix matrix;
        FoliageInstance instance;
        Quaternion tmp;
        Matrix world;