OGRE (O-O Graphics Rendering Engine)

Revision: 8750
          http://ogre.svn.sourceforge.net/ogre/?rev=8750&view=rev
Author:   sinbad
Date:     2009-06-27 17:46:38 +0000 (Sat, 27 Jun 2009)

Log Message:
-----------
Patch 2813291: fix inclusion of terrain component in PlayPen (I could have sworn I'd already done this)

Modified Paths:
--------------
    trunk/Tests/PlayPen/CMakeLists.txt

Modified: trunk/Tests/PlayPen/CMakeLists.txt
===================================================================
--- trunk/Tests/PlayPen/CMakeLists.txt	2009-06-27 16:53:11 UTC (rev 8749)
+++ trunk/Tests/PlayPen/CMakeLists.txt	2009-06-27 17:46:38 UTC (rev 8750)
@@ -22,9 +22,11 @@
 endif ()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${CMAKE_SOURCE_DIR}/Samples/Common/include)
+include_directories(
+	${CMAKE_SOURCE_DIR}/Samples/Common/include 
+	${CMAKE_SOURCE_DIR}/Components/Terrain/include)
 add_executable(PlayPen WIN32 ${HEADER_FILES} ${SOURCE_FILES} ${RESOURCE_FILES} )
-target_link_libraries(PlayPen ${OGRE_LIBRARIES} ${OIS_LIBRARIES})
+target_link_libraries(PlayPen ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${OGRE_Terrain_LIBRARIES})
 ogre_config_sample(PlayPen)
 
 add_dependencies(PlayPen ${TEST_DEPENDENCIES})


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8749
          http://ogre.svn.sourceforge.net/ogre/?rev=8749&view=rev
Author:   sinbad
Date:     2009-06-27 16:53:11 +0000 (Sat, 27 Jun 2009)

Log Message:
-----------
Patch 2812934: Correctly clean up MRTs in CompositorInstance::freeResources

Modified Paths:
--------------
    trunk/OgreMain/src/OgreCompositorInstance.cpp

Modified: trunk/OgreMain/src/OgreCompositorInstance.cpp
===================================================================
--- trunk/OgreMain/src/OgreCompositorInstance.cpp	2009-06-26 19:48:31 UTC (rev 8748)
+++ trunk/OgreMain/src/OgreCompositorInstance.cpp	2009-06-27 16:53:11 UTC (rev 8749)
@@ -749,7 +749,7 @@
 			// Potentially many surfaces
 			for (size_t s = 0; s < subSurf; ++s)
 			{
-				String texName = subSurf > 1 ? getMRTTexLocalName(def->name, subSurf)
+				String texName = subSurf > 1 ? getMRTTexLocalName(def->name, s)
 					: def->name;
 
 				LocalTextureMap::iterator i = mLocalTextures.find(texName);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.