1. Steve Streeting
  2. ogre


Holger Frydrych  committed cb6006c Merge

Merge from v1-7

  • Participants
  • Parent commits 1fd5f25, 7230831
  • Branches v1-8

Comments (0)

Files changed (6)

File .hgtags

View file
 3e9ed7c712e179a9a3f8434117d32b6ce4a15762 v1-7-2
 548833a16388faee9a9701829f375767225a90e2 v1-7-3
 123466e1905576be1e4cdee82de0f2782d73885e v1-8-0RC1
+3467d92e149c044b3c9a3527827f49f4ef9ae604 v1-7-4

File Docs/ChangeLog.html

View file
 <p class="header" align="center">Change Log</p>
 <p class="mainheader">
+    v1.7.4 [Cthugha] (14 January 2012) - MAINTENANCE RELEASE</p>
+<li>iOS: Fix the fix I did for libraries that are included in SDK builds. Use iOS 3.2 when building SDKs</li>
+<li>OS X: Add visibility attributes to Cocoa classes so the symbols are exported. Apparently symbol visibility only has an effect for Objective-C on x86_64 targets.</li>
+<li>OS X: Fix the OS X build</li>
+<li>Bug 443: Small fix for Image::setColourAt</li>
+<li>GL: Fix for a couple old bugs that could cause lots of GL errors.  One is an assumption about 2 sided stencil support always being there.  The other related to the wrong enumerations being used for the extension that we are checking.  See <a href="http://www.ogre3d.org/forums/viewtopic.php?f=2&t=44132">relevant forum topic</a>.</li>
+<li>Missing D3D9 Software vertex processing fix</li>
+<li>Xcode templates update</li>
+<li>Adding RTShaderLib files to Xcode templates</li>
+<li>OS X: Fix for input issues on Lion.  NSTitledWindowMask is no longer implied when creating a NSWindow.  To fix, we just add it to the style mask that we use.</li>
+<li>iOS: The Dynamic Texture sample works.  It should be enabled.</li>
+<li>Add a forward slash to the beginning of paths in the Xcode 4 templates to workaround a weird bug in the template wizard that eats up any leading slashes in text fields</li>
+<li>GLES: A little cleanup and fixed GL errors when using BGRA textures.</li>
+<li>Fix the incorrect average and max FPS entries in SDK trays.</li>
+<li>The Xcode 4 templates will need to link to the CoreGraphics framework now.</li>
+<li>OS X: FSAA was not being applied to the both Carbon and Cocoa contexts at all.</li>
+<li>Updated FindOGRE.cmake to properly set OGRE_${COMPONENT}_BINARY variables with paths to the corresponding DLLs</li>
+<li>Updated FindTBB.cmake to correctly identify the version of Visual Studio used</li>
+<li>Consider OGRE_LIB_DIRECTORY when setting RPATH for SampleBrowser and OctreeZone plugin</li>
+<li>Fix D3D9 capabilities check for cubemaps</li>
+<li>Fixed a memory leak in InstancedGeometry</li>
+<li>Fix Boost license file location in CMake</li>
+<li>Fix definition of element extremes in ogremeshxml.dtd</li>
+<li>Have D3D9 rendersystem clean up properly when creating a renderwindow fails</li>
+<p class="mainheader">
     v1.7.3 [Cthugha] (08 May 2011) - MAINTENANCE RELEASE</p>
 <li>iOS: Remove the animation timer.  Since DisplayLink is used by default now, this only hurts performance of things like input.</li>

File OgreMain/include/OgrePrerequisites.h

File contents unchanged.

File RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp

View file
-		mDeviceManager->linkRenderWindow(renderWindow);
+        try
+        {
+		    mDeviceManager->linkRenderWindow(renderWindow);
+        }
+        catch (const Ogre::RenderingAPIException&)
+        {
+            // after catching the exception, clean up
+            mResourceManager->unlockDeviceAccess();
+            renderWindow->destroy();
+            // re-throw
+            throw;
+        }

File SDK/OSX/make_osx.sh

File contents unchanged.

File SDK/Win32/removeabsolutepaths.vbs

View file
 'replace all string In the source file
-dFileContents = Replace(FileContents, OrigText, "../..", 1, -1, 1)
+cFileContents = Replace(FileContents, OrigText, "../..", 1, -1, 1)
+dFileContents = Replace(cFileContents, CurDir, "..\..", 1, -1, 1)
 ' Update if different
 if dFileContents <> FileContents Then WriteFile FileName, dFileContents