sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
SirLynix
2022-06-05 18:51:21 +02:00
committed by Jérôme Leclercq
parent b8ea79c40e
commit d60fce169a
2 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Graphics/BasicMaterial.cpp
View File

@@ -151,14 +151,14 @@ namespace Nz
options.defaultValues
});
FieldOffsets skeletalOffsets(StructLayout::Std140);
skeletalOffsets.AddMatrixArray(StructFieldType::Float1, 4, 4, true, 100);
nzsl::FieldOffsets skeletalOffsets(nzsl::StructLayout::Std140);
skeletalOffsets.AddMatrixArray(nzsl::StructFieldType::Float1, 4, 4, true, 100);
settings.sharedUniformBlocks.push_back({
6,
"SkeletalData",
{},
ShaderStageType::Vertex
nzsl::ShaderStageType::Vertex
});
// Common data