Index: trunk/VUT/work/TestCullingTerrain/TestCullingTerrain.vcproj
===================================================================
--- trunk/VUT/work/TestCullingTerrain/TestCullingTerrain.vcproj	(revision 136)
+++ trunk/VUT/work/TestCullingTerrain/TestCullingTerrain.vcproj	(revision 187)
@@ -73,5 +73,5 @@
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\ReferenceApplication\ReferenceAppLayer\include&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\GtpVisibility\include;..\include;..\TestCulling"
+				AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\GtpVisibility\include;..\include"
 				PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"
 				RuntimeLibrary="2"
@@ -88,5 +88,5 @@
 				OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;$(GAMETOOLS_PATH)\trunk\VUT\Ogre\lib\$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;$(GAMETOOLS_PATH)\trunk\VUT\Ogre\lib\$(ConfigurationName)&quot;"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
Index: trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp
===================================================================
--- trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp	(revision 183)
+++ trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp	(revision 187)
@@ -169,11 +169,6 @@
 
 	// set scene manager options
-	mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
-
-	// apply delayed rendering (i.e., transparents after hierarchical culling pass)
-	// only if optimization is not used 
-	bool delayRenderTransparents = !mTestGeometryForVisibleLeaves;
-
-	mSceneMgr->setOption("DelayRenderTransparents", &delayRenderTransparents);
+	setTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
+
 	mSceneMgr->setOption("UseDepthPass", &mUseDepthPass);
 	
@@ -190,12 +185,7 @@
 TerrainFrameListener::~TerrainFrameListener()
 {
-	delete mRayQueryExecutor;
-	delete mEventProcessor;
-
-	if (mQueryManager)
-	{
-		delete mQueryManager;
-		mQueryManager = NULL;
-	}
+	OGRE_DELETE(mRayQueryExecutor);
+	OGRE_DELETE(mEventProcessor);
+	OGRE_DELETE(mQueryManager);
 }
 //-----------------------------------------------------------------------
@@ -858,7 +848,6 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::toggleTestGeometryForVisibleLeaves()
-{
-	mTestGeometryForVisibleLeaves = !mTestGeometryForVisibleLeaves;
+void TerrainFrameListener::setTestGeometryForVisibleLeaves(bool testGeometryForVisibleLeaves)
+{
 	mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
 	
@@ -1005,5 +994,6 @@
 		break;
 	case KC_G:
-		toggleTestGeometryForVisibleLeaves();
+		mTestGeometryForVisibleLeaves = !mTestGeometryForVisibleLeaves;
+		setTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
 		break;
 	case KC_T:
Index: trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp
===================================================================
--- trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp	(revision 175)
+++ trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp	(revision 187)
@@ -227,4 +227,7 @@
 void TestCullingTerrainApplication::createScene()
 {
+	Real scale = 3;
+	mSceneMgr->setOption("NodeVizScale", &scale);
+
 	// Set ambient light
 	mAmbientLight = ColourValue(0.5 , 0.5, 0.5);
Index: trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h
===================================================================
--- trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h	(revision 174)
+++ trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h	(revision 187)
@@ -119,5 +119,5 @@
     void changeThreshold(int incr);
 	void changeAssumedVisibility(int incr);
-	void toggleTestGeometryForVisibleLeaves();
+	void setTestGeometryForVisibleLeaves(bool testGeometryForVisibleLeaves);
 	void toggleShowOctree();
 	void toggleUseDepthPass();
