TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'gg/development-3.6' into development

Browse source 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
This commit is contained in:
Daniel Buckmaster 2015-01-29 21:17:38 +11:00
commit 014b566014
29 changed files with 252 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/console/simObject.cpp
View file

@ -1599,8 +1599,7 @@ void SimObject::unlinkNamespaces()
// Handle object name.
StringTableEntry objectName = getName();
if( objectName && objectName[ 0 ] )
if (mNameSpace && mNameSpace->mClassRep == NULL)
mNameSpace->decRefCountToParent();
mNameSpace = NULL;