Index: trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp
===================================================================
--- trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp	(revision 156)
+++ trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp	(revision 158)
@@ -453,6 +453,5 @@
 			++nodesSize;
 
-			int id = sm->GetHierarchyInterface()->GetNodeId((*nodesIt).GetNode());
-			std::stringstream d; d << "Node " << id << " visibility: " << vis;
+			std::stringstream d; d << "Node visibility: " << vis;
 			LogManager::getSingleton().logMessage(d.str());
 		}	
Index: trunk/VUT/work/ogre_changes/OgreMain/include/OgreRenderable.h
===================================================================
--- trunk/VUT/work/ogre_changes/OgreMain/include/OgreRenderable.h	(revision 153)
+++ trunk/VUT/work/ogre_changes/OgreMain/include/OgreRenderable.h	(revision 158)
@@ -227,5 +227,9 @@
             }
         }
+		/** Sets an id for this renderable.
+		*/
 		void setId(int id) {mId = id;}
+		/** see set 
+		*/
 		int getId() {return mId;}
 
Index: trunk/VUT/work/ogre_changes/OgreMain/include/OgreSceneNode.h
===================================================================
--- trunk/VUT/work/ogre_changes/OgreMain/include/OgreSceneNode.h	(revision 154)
+++ trunk/VUT/work/ogre_changes/OgreMain/include/OgreSceneNode.h	(revision 158)
@@ -444,11 +444,4 @@
 		void setLastRendered(int frameid);
 
-		/** Sets scene node id 
-		@param the id
-		*/
-		void setId(int id);
-		/** see set */
-		int getId(void);
-
 	protected:
 		int mLastVisited;
Index: trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneNode.cpp
===================================================================
--- trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneNode.cpp	(revision 154)
+++ trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneNode.cpp	(revision 158)
@@ -42,5 +42,5 @@
 	mYawFixed(false), mAutoTrackTarget(0), mIsInSceneGraph(false)
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-	, mLastVisited(0), mVisible(false), mLastRendered(-1), mId(-1)
+	, mLastVisited(0), mVisible(false), mLastRendered(-1)
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
     {
@@ -53,5 +53,5 @@
 	mAutoTrackTarget(0), mIsInSceneGraph(false)
 	#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-	, mLastVisited(0), mVisible(false), mId(-1)
+	, mLastVisited(0), mVisible(false)
 	#endif //GTP_VISIBILITY_MODIFIED_OGRE
     {
@@ -641,14 +641,4 @@
 		mLastRendered = frameid;
 	}
-	//-----------------------------------------------------------------------
-	void SceneNode::setId(int id)
-	{
-		mId = id;
-	}
-	//-----------------------------------------------------------------------
-	int SceneNode::getId(void)
-	{
-		return mId;
-	}
 	#endif //GTP_VISIBILITY_MODIFIED_OGRE
 }
Index: trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h
===================================================================
--- trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h	(revision 154)
+++ trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h	(revision 158)
@@ -192,12 +192,4 @@
 	void _updateBounds();
 
-	/** Sets scene node id 
-	@param the id
-	*/
-	void setId(int id);
-	
-	/** see set */
-	int getId(void);
-
 protected:
 	
@@ -209,5 +201,5 @@
 	bool mVisible;
 	int mDepth;
-	int mId;
+	
 
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
Index: trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp
===================================================================
--- trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp	(revision 154)
+++ trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp	(revision 158)
@@ -88,5 +88,5 @@
       mHalfSize( 0, 0, 0 )
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-	, mLastVisited(0), mVisible(false), mLastRendered(-1), mId(-1)
+	, mLastVisited(0), mVisible(false), mLastRendered(-1)
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 {
@@ -271,14 +271,5 @@
 	}
  }
-//-----------------------------------------------------------------------
-void Octree::setId(int id)
-{
-	mId = id;
-}
-//-----------------------------------------------------------------------
-int Octree::getId()
-{
-	return mId;
-}
+
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 }
Index: trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp
===================================================================
--- trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp	(revision 154)
+++ trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp	(revision 158)
@@ -316,8 +316,9 @@
 
     mOctree = new Octree( 0 );
+
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-	mNumOctreeNodes = 1;
-	mOctree->setId(mNumOctreeNodes);
+	mNumOctreeNodes = 1; // count number of octants
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
+
     mMaxDepth = depth;
     mBox = box;
@@ -469,5 +470,5 @@
             octant -> mChildren[ x ][ y ][ z ] = new Octree( octant );
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-	mOctree->setId(++ mNumOctreeNodes);
+	++ mNumOctreeNodes;
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 
@@ -1031,8 +1032,9 @@
 
     mOctree = new Octree( 0 );
+
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
 	mNumOctreeNodes = 1;
-	mOctree->setId(mNumOctreeNodes);
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
+
     mOctree->mBox = box;
 
