Merge branch 'nazara-next' into graphics-next

2021-01-28 16:37:46 +01:00
parent 5eedd3c0bc afe190041f
commit 2ef772cec7
23 changed files with 215 additions and 157 deletions
--- a/src/Nazara/Shader/ShaderAstSerializer.cpp
+++ b/src/Nazara/Shader/ShaderAstSerializer.cpp
@@ -301,7 +301,7 @@ namespace Nz

 	void ShaderAstSerializerBase::Serialize(ShaderNodes::SwizzleOp& node)
 	{
-		Value(node.componentCount);
+		SizeT(node.componentCount);
 		Node(node.expression);

 		for (std::size_t i = 0; i < node.componentCount; ++i)
@@ -805,7 +805,7 @@ namespace Nz
 	{
 		m_stream >> val;
 	}
-
+	
 	void ShaderAstUnserializer::Variable(ShaderNodes::VariablePtr& var)
 	{
 		Int32 nodeTypeInt;