diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-07 20:36:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 20:36:20 +0200 |
| commit | 31600f07d2fae10a2f256ea5621e0a64d8bb671b (patch) | |
| tree | 3bdefcacfa7925d4ca0ca7ed8bdc94978b8db123 /core/math/basis.h | |
| parent | 667e464e64c98692b3ea1412a143c624d754dbb7 (diff) | |
| parent | 40197685bb0dbc76b7670fdd9fdddf07b44659ff (diff) | |
Merge pull request #32623 from madmiraal/remove-circular-includes
Remove circular dependency between Vector3 and Basis.
Diffstat (limited to 'core/math/basis.h')
| -rw-r--r-- | core/math/basis.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/math/basis.h b/core/math/basis.h index 053effda69..4be4ea4cd3 100644 --- a/core/math/basis.h +++ b/core/math/basis.h @@ -28,13 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -// Circular dependency between Vector3 and Basis :/ -#include "core/math/vector3.h" - #ifndef BASIS_H #define BASIS_H #include "core/math/quat.h" +#include "core/math/vector3.h" class Basis { public: |