GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.12' into 1.12

Browse Source
This commit is contained in:
Wojtek Figat
2026-03-27 11:22:32 +01:00
parent 7531b1fdbd 51ff2969e1
commit 54202eeb8a
129 changed files with 1493 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp
View File

@@ -88,9 +88,8 @@ void TerrainMaterialShader::Bind(BindParameters& params)
}
// Bind terrain textures
const auto heightmap = drawCall.Terrain.Patch->Heightmap->GetTexture();
const auto splatmap0 = drawCall.Terrain.Patch->Splatmap[0] ? drawCall.Terrain.Patch->Splatmap[0]->GetTexture() : nullptr;
const auto splatmap1 = drawCall.Terrain.Patch->Splatmap[1] ? drawCall.Terrain.Patch->Splatmap[1]->GetTexture() : nullptr;
GPUTexture* heightmap, *splatmap0, *splatmap1;
drawCall.Terrain.Patch->GetTextures(heightmap, splatmap0, splatmap1);
context->BindSR(0, heightmap);
context->BindSR(1, splatmap0);
context->BindSR(2, splatmap1);