2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

Notes:
* Sequence transform strip uses G.scene global, this is commented
  out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
  2.5 got merged, but no new files were added. Calls to these files
  are commented out with "XXX etch-a-ton". editarmature.c and
  transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
  (player still fails to link).

4 files changed, 23 insertions, 9 deletions

diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript
index a0733b6c51c..0692b170a61 100644
--- a/source/gameengine/SceneGraph/SConscript
+++ b/source/gameengine/SceneGraph/SConscript
@@ -6,4 +6,9 @@ sources = env.Glob('*.cpp')
 
 incs = '. #intern/moto/include'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[280,125] )
+cxxflags = []
+if env['OURPLATFORM']=='win32-vc':
+	cxxflags.append ('/GR')
+	cxxflags.append ('/O2')
+
+env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,125], cxx_compileflags = cxxflags )
diff --git a/source/gameengine/SceneGraph/SG_BBox.cpp b/source/gameengine/SceneGraph/SG_BBox.cpp
index 4bd2805978e..a44262d04f7 100644
--- a/source/gameengine/SceneGraph/SG_BBox.cpp
+++ b/source/gameengine/SceneGraph/SG_BBox.cpp
@@ -34,8 +34,8 @@
  #include "SG_Node.h"
  
 SG_BBox::SG_BBox() :
-	m_min(MT_Point3(0., 0., 0.)),
-	m_max(MT_Point3(0., 0., 0.))
+	m_min(0., 0., 0.),
+	m_max(0., 0., 0.)
 {
 }
 
diff --git a/source/gameengine/SceneGraph/SG_Spatial.cpp b/source/gameengine/SceneGraph/SG_Spatial.cpp
index 5ba116e59db..99aeb3e72ee 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.cpp
+++ b/source/gameengine/SceneGraph/SG_Spatial.cpp
@@ -44,13 +44,13 @@ SG_Spatial(
 ): 
 
 	SG_IObject(clientobj,clientinfo,callbacks),
-	m_localPosition(MT_Point3(0.0,0.0,0.0)),
-	m_localRotation(MT_Matrix3x3(1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0)),
-	m_localScaling(MT_Vector3(1.f,1.f,1.f)),
+	m_localPosition(0.0,0.0,0.0),
+	m_localRotation(1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0),
+	m_localScaling(1.f,1.f,1.f),
 	
-	m_worldPosition(MT_Point3(0.0,0.0,0.0)),
-	m_worldRotation(MT_Matrix3x3(1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0)),
-	m_worldScaling(MT_Vector3(1.f,1.f,1.f)),
+	m_worldPosition(0.0,0.0,0.0),
+	m_worldRotation(1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0),
+	m_worldScaling(1.f,1.f,1.f),
 
 	m_parent_relation (NULL),
 	
@@ -297,6 +297,13 @@ GetWorldScaling(
 	return m_worldScaling;
 }
 
+void SG_Spatial::SetWorldFromLocalTransform()
+{
+	m_worldPosition= m_localPosition;
+	m_worldScaling= m_localScaling;
+	m_worldRotation= m_localRotation;
+}
+
 SG_BBox& SG_Spatial::BBox()
 {
 	return m_bbox;
diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h
index 28848b0f933..6ccec2aa9c1 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.h
+++ b/source/gameengine/SceneGraph/SG_Spatial.h
@@ -176,6 +176,8 @@ public:
 	GetWorldScaling(
 	) const	;
 
+	void SetWorldFromLocalTransform();
+
 	MT_Transform GetWorldTransform() const;
 
 	bool	ComputeWorldTransforms(		const SG_Spatial *parent);