From 4ef08067b7f951ac2dbcd85dbd4dbd72839a7bbc Mon Sep 17 00:00:00 2001
From: Don BURNS <don@andesengineering.com>
Date: Wed, 21 Nov 2001 15:53:29 +0000
Subject: [PATCH] Small fix for  preprocessor _MP symbol clash with MFC.

---
 include/osg/Camera |  4 ++--
 src/osg/Camera.cpp | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/osg/Camera b/include/osg/Camera
index 4dd73e554..dea1dd2a2 100644
--- a/include/osg/Camera
+++ b/include/osg/Camera
@@ -301,8 +301,8 @@ class SG_EXPORT Camera: public osg::Referenced
         mutable ref_ptr<Matrix> _modelViewMatrix;
         mutable ClippingVolume  _clippingVolume;
 
-        mutable ref_ptr<Matrix> _MP;
-        mutable ref_ptr<Matrix> _inverseMP;
+        mutable ref_ptr<Matrix> _mp;
+        mutable ref_ptr<Matrix> _inversemp;
 
         void calculateMatricesAndClippingVolume() const;
         
diff --git a/src/osg/Camera.cpp b/src/osg/Camera.cpp
index cfc946971..b00039f9c 100644
--- a/src/osg/Camera.cpp
+++ b/src/osg/Camera.cpp
@@ -667,11 +667,11 @@ void Camera::calculateMatricesAndClippingVolume() const
 
     _clippingVolume.transformProvidingInverse(*_modelViewMatrix);
 
-    if (!_MP.valid()) _MP = new Matrix;
-    _MP->mult(*_modelViewMatrix,*_projectionMatrix);
+    if (!_mp.valid()) _mp = new Matrix;
+    _mp->mult(*_modelViewMatrix,*_projectionMatrix);
     
-    if (!_inverseMP.valid()) _inverseMP = new Matrix;
-    _inverseMP->invert(*_MP);
+    if (!_inversemp.valid()) _inversemp = new Matrix;
+    _inversemp->invert(*_mp);
 
     _dirty = false;
 }
@@ -686,9 +686,9 @@ void Camera::ensureOrthogonalUpVector()
 
 const bool Camera::project(const Vec3& obj,const Viewport& viewport,Vec3& win) const
 {
-    if (_MP.valid())
+    if (_mp.valid())
     {
-        Vec3 v = obj * (*_MP);
+        Vec3 v = obj * (*_mp);
         
         win.set(
                 (float)viewport.x() + (float)viewport.width()*(v[0]+1.0f)*0.5f,
@@ -704,7 +704,7 @@ const bool Camera::project(const Vec3& obj,const Viewport& viewport,Vec3& win) c
 
 const bool Camera::unproject(const Vec3& win,const Viewport& viewport,Vec3& obj) const
 {
-    if (_inverseMP.valid())
+    if (_inversemp.valid())
     {
         Vec3 v(
                 2.0f*(win[0]-(float)viewport.x())/viewport.width() - 1.0f,
@@ -712,7 +712,7 @@ const bool Camera::unproject(const Vec3& win,const Viewport& viewport,Vec3& obj)
                 2.0f*(win[2]) - 1.0f
                );
                
-        obj = v * (*_inverseMP);
+        obj = v * (*_inversemp);
         
         return true;
     }