diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-07 08:41:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-07 08:41:15 +0400 |
| commit | bc093b4cc485757cd07875a9b5576cbb2567696f (patch) | |
| tree | a054ba0c70f2645845a261d4fe9b899f8b36986e /source/gameengine/Ketsji | |
| parent | 77d79ffb5d1c4d214f2aa8decfe8e5a53138369a (diff) | |
| parent | e7c53e20a18573e05970beb93184fc32b88c98c9 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22205:22290
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 63d23f5af31..12df262df56 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1008,8 +1008,12 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj) // in case this is a camera m_cameras.remove((KX_Camera*)newobj); + /* currently does nothing, keep incase we need to Unregister something */ +#if 0 if (m_sceneConverter) m_sceneConverter->UnregisterGameObject(newobj); +#endif + // return value will be 0 if the object is actually deleted (all reference gone) return ret; |