merge

2021-08-08 15:46:47 +03:00
parent 9cc1201892 668311a444
commit 74f00c3c63
24 changed files with 42 additions and 23 deletions
--- a/src/renderer/Sprite.cpp
+++ b/src/renderer/Sprite.cpp
@@ -5,6 +5,10 @@
 #include "Camera.h"
 #include "Sprite.h"

+#ifdef ASPECT_RATIO_SCALE
+#include "Frontend.h"
+#endif
+
 float CSprite::m_f2DNearScreenZ;
 float CSprite::m_f2DFarScreenZ;
 float CSprite::m_fRecipNearClipPlane;