merge master, fix conflicts

Author: keptsecret

09_GeometryCreator/main.cpp

@@ -2,7 +2,6 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#include <nbl/builtin/hlsl/math/linalg/transformation_matrix_utils.hlsl>
 #include <nbl/builtin/hlsl/math/thin_lens_projection.hlsl>
 
 #include "common.hpp"

24_ColorSpaceTest/main.cpp

@@ -793,6 +793,7 @@ class ColorSpaceTestSampleApp final : public SimpleWindowedApplication, public B
 							};
 							cmdbuf->beginRenderPass(info,IGPUCommandBuffer::SUBPASS_CONTENTS::INLINE);
 						}
+
 						cmdbuf->bindGraphicsPipeline(m_pipeline.get());
 						cmdbuf->pushConstants(m_pipeline->getLayout(),hlsl::ShaderStage::ESS_FRAGMENT,0,sizeof(push_constants_t),&pc);
 						cmdbuf->bindDescriptorSets(nbl::asset::EPBP_GRAPHICS,m_pipeline->getLayout(),3,1,&ds);