sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed debug error when copying a matrix

Browse Source 
Former-commit-id: 60c57643b5a520abe96fdca83f2d0c28f3bc1f11
This commit is contained in:
Lynix
2012-11-27 20:25:14 +01:00
parent 38c1cf2ad0
commit 4fbe508960
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/Resource.hpp
View File

@@ -50,7 +50,7 @@ class NAZARA_API NzResource
void RemoveResourceListener(NzResourceListener* listener) const;
void RemoveResourceReference() const;
void SetPersistent(bool persistent = true);
void SetPersistent(bool persistent = true, bool checkReferenceCount = true);
protected:
void NotifyCreated();

8
include/Nazara/Math/Matrix4.inl
View File

@@ -590,9 +590,9 @@ NzMatrix4<T>& NzMatrix4<T>::MakeZero()
template<typename T>
NzMatrix4<T>& NzMatrix4<T>::Set(T r11, T r12, T r13, T r14,
T r21, T r22, T r23, T r24,
T r31, T r32, T r33, T r34,
T r41, T r42, T r43, T r44)
T r21, T r22, T r23, T r24,
T r31, T r32, T r33, T r34,
T r41, T r42, T r43, T r44)
{
m11 = r11;
m12 = r12;
@@ -626,9 +626,7 @@ NzMatrix4<T>& NzMatrix4<T>::Set(const T matrix[16])
template<typename T>
NzMatrix4<T>& NzMatrix4<T>::Set(const NzMatrix4& matrix)
{
NazaraError("Check 1");
std::memcpy(&m11, &matrix.m11, 16*sizeof(T));
NazaraError("Check 2");
return *this;
}