diff options
author | J08nY <johny@neuromancer.sk> | 2016-06-19 00:06:04 +0200 |
---|---|---|
committer | J08nY <johny@neuromancer.sk> | 2016-06-19 00:41:52 +0200 |
commit | 449571b6cd48083fb34a4f7aebe6758cd527afc9 (patch) | |
tree | ec8eb007bfa077747e989a9e45eecee1ca74be6a /core | |
parent | a95a1f47a45a5d8595c6681c28abd31ab0635479 (diff) |
Remove USE_QUAD_VECTORS unused check
Diffstat (limited to 'core')
-rw-r--r-- | core/math/vector3.h | 13 | ||||
-rw-r--r-- | core/variant.h | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/core/math/vector3.h b/core/math/vector3.h index 528c4d37b3..910446023a 100644 --- a/core/math/vector3.h +++ b/core/math/vector3.h @@ -44,18 +44,6 @@ struct Vector3 { }; union { - -#ifdef USE_QUAD_VECTORS - - struct { - real_t x; - real_t y; - real_t z; - real_t _unused; - }; - real_t coord[4]; -#else - struct { real_t x; real_t y; @@ -63,7 +51,6 @@ struct Vector3 { }; real_t coord[3]; -#endif }; _FORCE_INLINE_ const real_t& operator[](int p_axis) const { diff --git a/core/variant.h b/core/variant.h index 5ddfe40398..9c93ecb73b 100644 --- a/core/variant.h +++ b/core/variant.h @@ -151,11 +151,7 @@ private: InputEvent *_input_event; Image *_image; void *_ptr; //generic pointer -#ifdef USE_QUAD_VECTORS - uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*5) ? sizeof(ObjData) : (sizeof(real_t)*5)]; // plane uses an extra real -#else uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*4) ? sizeof(ObjData) : (sizeof(real_t)*4)]; -#endif } _data; |