Merge pull request #25495 from IronicallySerious/fix-expand-macros

Fix parameterised macros in core. Addresses #25488
2019-03-16 11:20:52 -07:00
parent e5a310cd38 4121df235e
commit aff3dd36ba
3 changed files with 3 additions and 3 deletions
--- a/core/math/geometry.cpp
+++ b/core/math/geometry.cpp
@ -515,7 +515,7 @@ static inline void _build_faces(uint8_t ***p_cell_status, int x, int y, int z, i
 		Vector3(1,1,1),
 	};
 */
-#define vert(m_idx) Vector3((m_idx & 4) >> 2, (m_idx & 2) >> 1, m_idx & 1)
+#define vert(m_idx) Vector3(((m_idx)&4) >> 2, ((m_idx)&2) >> 1, (m_idx)&1)

 	static const uint8_t indices[6][4] = {
 		{ 7, 6, 4, 5 },