mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 21:36:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux work

Browse Source 
Merge branch 'master' of https://github.com/mfeemster/fractorium
This commit is contained in:
mfeemster
2014-12-08 02:19:29 -08:00
parent 9947cd1c84 fad9206229
commit 9263906cb5
3 changed files with 618 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Ember/Xform.h
View File

@ -185,7 +185,7 @@ public:
//If this xform was already part of a different ember, then do not assign, else do.
if (!m_ParentEmber && (typeid(T) == typeid(U)))
m_ParentEmber = static_cast<Ember<T>*>(xform.ParentEmber());
m_ParentEmber = reinterpret_cast<Ember<T>*>(xform.ParentEmber());
CopyVec<T, U>(m_Xaos, xform.XaosVec());
CopyVec(m_Motion, xform.m_Motion);