2.50:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.

1 files changed, 22 insertions, 0 deletions

diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h
index 0a226ac30f9..4398e2d00c3 100644
--- a/source/gameengine/Rasterizer/RAS_FramingManager.h
+++ b/source/gameengine/Rasterizer/RAS_FramingManager.h
@@ -209,6 +209,18 @@ public :
 
 	static
 		void
+	ComputeOrtho(
+		const RAS_FrameSettings &settings,
+		const RAS_Rect &availableViewport,
+		const RAS_Rect &viewport,
+		const float scale,
+		const float camnear,
+		const float camfar,
+		RAS_FrameFrustum &frustum
+	);
+
+	static
+		void
 	ComputeFrustum(
 		const RAS_FrameSettings &settings,
 		const RAS_Rect &availableViewport,
@@ -229,6 +241,16 @@ public :
 		RAS_FrameFrustum & frustum
 	);	
 
+	static
+		void
+	ComputeDefaultOrtho(
+		const float camnear,
+		const float camfar,
+		const float scale,
+		const float design_aspect_ratio,
+		RAS_FrameFrustum & frustum
+	);
+
 private :
 
 	static