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

Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

This commit is contained in:
Jérôme Leclercq 2017-03-08 17:36:34 +01:00
parent 28e6b3869b 4ea43e0b0b
commit eca1a6c2cd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDK/src/NDK/Entity.cpp
View File

@ -30,6 +30,7 @@ namespace Ndk
m_enabled(entity.m_enabled), m_enabled(entity.m_enabled),
m_valid(entity.m_valid) m_valid(entity.m_valid)
{ {
entity.m_world = nullptr;
} }
/*! /*!
@ -53,7 +54,8 @@ namespace Ndk
Entity::~Entity() Entity::~Entity()
{ {
Destroy(); if (m_world)
Destroy();
} }
/*! /*!