diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-02 20:22:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-04 21:11:43 +0100 |
| commit | 494092dc0c2f6fd04dbd973d6f76f1df720dbcf7 (patch) | |
| tree | 7280cd8cf3d16e9989eca0ca3c6daa5daa1086fd /slideshow | |
| parent | cbe85ddc59b4f49f9fcf1c968519061c8c86cce9 (diff) | |
upgrade to latest glm
Change-Id: I75f145b71c0f82e87a94ef90709fb8fdf56041d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87833
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/opengl/Operation.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/opengl/Operation.cxx b/slideshow/source/engine/opengl/Operation.cxx index 6789fcc5ae6c..e70f203edad7 100644 --- a/slideshow/source/engine/opengl/Operation.cxx +++ b/slideshow/source/engine/opengl/Operation.cxx @@ -28,11 +28,11 @@ #include <sal/config.h> +#include <basegfx/numeric/ftools.hxx> + #include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/type_ptr.hpp> -#include <basegfx/numeric/ftools.hxx> - #include "Operation.hxx" SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin, diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index 5078a8c23bfd..d1926ab854f9 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -37,8 +37,8 @@ #include <comphelper/random.hxx> -#include "TransitionImpl.hxx" #include "Operation.hxx" +#include "TransitionImpl.hxx" #include <math.h> TransitionScene::TransitionScene(TransitionScene const& rOther) |