Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dep: Silenced build warning in G3D header

Browse Source
This commit is contained in:
Shauren
2015-08-01 18:53:50 +02:00
parent ca9d98f179
commit 22653c99f8
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dep/g3dlite/G3D-v9.0 hotfix5.diff Normal file
View File

@@ -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 */

4
dep/g3dlite/include/G3D/Quat.h
View File

@@ -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 */