[simspark-cvs] simspark/spark/oxygen/sceneserver basenode.cpp, 1.2, 1.2.4.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/sceneserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28839

Modified Files:
      Tag: projectx
	basenode.cpp 
Log Message:
merge from HEAD


Index: basenode.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/basenode.cpp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** basenode.cpp	15 Feb 2006 01:00:19 -0000	1.2
--- basenode.cpp	17 Jun 2007 08:05:16 -0000	1.2.4.1
***************
*** 201,205 ****
  }
  
! salt::Vector3f BaseNode::GetLocalPos(const salt::Vector3f& worldPos)
  {
      Matrix invWorld = GetWorldTransform();
--- 201,205 ----
  }
  
! salt::Vector3f BaseNode::GetLocalPos(const salt::Vector3f& worldPos) const
  {
      Matrix invWorld = GetWorldTransform();