Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2008-08-28 13:02:04 +0400
committerCampbell Barton <ideasman42@gmail.com>2008-08-28 13:02:04 +0400
commit794ffdcd2c0a659c076cf0b644a67ecaa4a6e853 (patch)
tree7856b2f09bdf9869b49703b0f952463ac027ab8f /source/gameengine/Ketsji
parentc8d0a540f5372850237ac699dce753d7bba9c6df (diff)
didnt build before committiong this small change :/
isLight() is apricot only. Add this back when GLSL is merged to avoid conflicts.
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index e0a7ebb5423..1c37fcea77e 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -944,7 +944,7 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj)
newobj->RemoveMeshes();
ret = 1;
- if (newobj->IsLight() && m_lightlist->RemoveValue(newobj))
+ if (m_lightlist->RemoveValue(newobj)) // TODO - use newobj->IsLight() test when its merged in from apricot. - Campbell
ret = newobj->Release();
if (m_objectlist->RemoveValue(newobj))
ret = newobj->Release();