fix interaction between two merges

devshgraphicsprogramming · devshgraphicsprogramming · commit fcb43e613a9f · 2026-02-05T17:04:46.000+01:00
diff --git a/50.IESViewer/AppInit.cpp b/50.IESViewer/AppInit.cpp
@@ -12,7 +12,7 @@
 #include "app_resources/common.hlsl"
 #include "app_resources/imgui.opts.hlsl"
 #include "nbl/ext/ImGui/ImGui.h"
-#include "nbl/builtin/hlsl/matrix_utils/transformation_matrix_utils.hlsl"
+#include "nbl/builtin/hlsl/math/thin_lens_projection.hlsl"
 #include "nbl/this_example/builtin/build/spirv/keys.hpp"
 
 bool IESViewer::parseCommandLine()
diff --git a/50.IESViewer/AppRender.cpp b/50.IESViewer/AppRender.cpp
@@ -8,7 +8,7 @@
 #include "nbl/ext/ImGui/ImGui.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 #include "app_resources/common.hlsl"
-#include "nbl/builtin/hlsl/matrix_utils/transformation_matrix_utils.hlsl"
+#include "nbl/builtin/hlsl/math/thin_lens_projection.hlsl"
 
 bool IESViewer::recreate3DPlotFramebuffers(uint32_t width, uint32_t height)
 {
diff --git a/50.IESViewer/AppUI.cpp b/50.IESViewer/AppUI.cpp
@@ -13,7 +13,7 @@
 #include "app_resources/common.hlsl"
 #include "app_resources/false_color.hlsl"
 #include "app_resources/imgui.opts.hlsl"
-#include "nbl/builtin/hlsl/matrix_utils/transformation_matrix_utils.hlsl"
+#include "nbl/builtin/hlsl/math/thin_lens_projection.hlsl"
 #include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
 #include "nbl/builtin/hlsl/math/octahedral.hlsl"
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include "nbl/ext/ImGui/ImGui.h"`
`9`	`9`	`#include "nbl/ext/ScreenShot/ScreenShot.h"`
`10`	`10`	`#include "app_resources/common.hlsl"`
`11`		`-#include "nbl/builtin/hlsl/matrix_utils/transformation_matrix_utils.hlsl"`
	`11`	`+#include "nbl/builtin/hlsl/math/thin_lens_projection.hlsl"`
`12`	`12`
`13`	`13`	`bool IESViewer::recreate3DPlotFramebuffers(uint32_t width, uint32_t height)`
`14`	`14`	`{`