diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-02-05 13:01:09 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-02-05 15:42:29 +0000 |
| commit | 0403ee45736241aa621eb3d38880a4fff571fd96 (patch) | |
| tree | 94650145a3b7e2517dfcf29d33f97859933b518d /src/render/raycasting | |
| parent | 04afcf1cb9e79697360baa01a97a26815237eba1 (diff) | |
| parent | ceae743678d41a58154612781e896c04c87a8c4f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/render/backend/trianglesvisitor.cpp
src/render/backend/uniform.cpp
src/render/jobs/calcboundingvolumejob.cpp
src/render/jobs/pickboundingvolumejob.cpp
src/render/jobs/pickboundingvolumeutils.cpp
Change-Id: Ib8305011c51710a3538c0b29f7022388f5244a38
Diffstat (limited to 'src/render/raycasting')
| -rw-r--r-- | src/render/raycasting/qray3d_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/raycasting/qray3d_p.h b/src/render/raycasting/qray3d_p.h index c5e2be078..8b7852cc3 100644 --- a/src/render/raycasting/qray3d_p.h +++ b/src/render/raycasting/qray3d_p.h @@ -93,6 +93,8 @@ public: bool operator==(const QRay3D &other) const; bool operator!=(const QRay3D &other) const; + bool isValid() const { return !m_direction.isNull() && !qFuzzyIsNull(m_distance); } + private: Vector3D m_origin; Vector3D m_direction; |