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>2009-08-03 03:53:53 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-08-03 03:53:53 +0400
commit95e08f6bff272162f2199744842a198742c35de2 (patch)
treec3adff7025e9b4e14aeb6e891c53798d8b7bd505
parentf45dcf022db02272d495ddfb07ffffe50e3f7f70 (diff)
* remove unused member of KX_Scene - m_objecttree
* implicit declaration of getenv in glutil.c
-rw-r--r--source/blender/src/glutil.c5
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp5
-rw-r--r--source/gameengine/Ketsji/KX_Scene.h4
3 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/src/glutil.c b/source/blender/src/glutil.c
index bb9b1be08b6..0772478be2d 100644
--- a/source/blender/src/glutil.c
+++ b/source/blender/src/glutil.c
@@ -33,6 +33,11 @@
#include <math.h>
#include <string.h>
+/* getenv only */
+#ifdef __linux__
+#include <stdlib.h>
+#endif
+
#include "MEM_guardedalloc.h"
#include "DNA_vec_types.h"
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index caab0f38db9..0aeccbcaaad 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1577,11 +1577,6 @@ void KX_Scene::SetGravity(const MT_Vector3& gravity)
GetPhysicsEnvironment()->setGravity(gravity[0],gravity[1],gravity[2]);
}
-void KX_Scene::SetNodeTree(SG_Tree* root)
-{
- m_objecttree = root;
-}
-
void KX_Scene::SetSceneConverter(class KX_BlenderSceneConverter* sceneConverter)
{
m_sceneConverter = sceneConverter;
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index c4f868f6a02..09fad7040a8 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -119,10 +119,6 @@ protected:
// the Qlist is for objects that needs to be rescheduled
// for updates after udpate is over (slow parent, bone parent)
- /**
- * The tree of objects in the scene.
- */
- SG_Tree* m_objecttree;
/**
* The set of cameras for this scene