diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-08-01 18:53:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-08-01 18:53:50 +0200 |
| commit | 22653c99f874e189bda6670c42be38151b58e52b (patch) | |
| tree | 169cb845e94dfcf695e322efb04f7c7d6b471fee | |
| parent | ca9d98f1794a065ad35034c404c3c3cbc5c3a24c (diff) | |
Dep: Silenced build warning in G3D header
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix5.diff | 15 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/Quat.h | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix5.diff b/dep/g3dlite/G3D-v9.0 hotfix5.diff new file mode 100644 index 00000000000..02f67a9b279 --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix5.diff @@ -0,0 +1,15 @@ +diff --git a/dep/g3dlite/include/G3D/Quat.h b/dep/g3dlite/include/G3D/Quat.h +index 04e11e0..b26708a 100644 +--- a/dep/g3dlite/include/G3D/Quat.h ++++ b/dep/g3dlite/include/G3D/Quat.h +@@ -335,8 +335,8 @@ public: + Note that q.pow(a).pow(b) == q.pow(a + b) + @cite Dam98 pg 21 + */ +- inline Quat pow(float x) const { +- return (log() * x).exp(); ++ inline Quat pow(float r) const { ++ return (log() * r).exp(); + } + + /** Make unit length in place */ diff --git a/dep/g3dlite/include/G3D/Quat.h b/dep/g3dlite/include/G3D/Quat.h index 04e11e084a0..b26708a6d48 100644 --- a/dep/g3dlite/include/G3D/Quat.h +++ b/dep/g3dlite/include/G3D/Quat.h @@ -335,8 +335,8 @@ public: Note that q.pow(a).pow(b) == q.pow(a + b) @cite Dam98 pg 21 */ - inline Quat pow(float x) const { - return (log() * x).exp(); + inline Quat pow(float r) const { + return (log() * r).exp(); } /** Make unit length in place */ |