summaryrefslogtreecommitdiff
path: root/slideshow/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-06 16:57:39 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-02-28 13:27:51 +0100
commit074120445876d1451995c8459769af76c375a0bf (patch)
tree4ac61c882fba2303caec8314d89f1c33844411ad /slideshow/source
parent50b6f97730ecf5ed79b0ac05dea9b9b163108aae (diff)
upgrade to latest glm
This reverts commit 46e53c0360a38f620cf8c86fd0a3dc46c8238e0e. Reason for revert: intermittent failure was due to a missing fix in etonyek Change-Id: I1ddaafc821cd494092ab66309386464c6e2c33c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88118 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'slideshow/source')
-rw-r--r--slideshow/source/engine/opengl/Operation.cxx4
-rw-r--r--slideshow/source/engine/opengl/TransitionImpl.cxx2
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)