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, 66 insertions, 7 deletions

diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
index 6beab28d61f..8e90c9a1c08 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
@@ -42,7 +42,7 @@
 
 /* mesh slot */
 
-RAS_MeshSlot::RAS_MeshSlot()
+RAS_MeshSlot::RAS_MeshSlot() : SG_QList()
 {
 	m_clientObj = NULL;
 	m_pDeformer = NULL;
@@ -56,6 +56,7 @@ RAS_MeshSlot::RAS_MeshSlot()
 	m_DisplayList = NULL;
 	m_bDisplayList = true;
 	m_joinSlot = NULL;
+	m_pDerivedMesh = NULL;
 }
 
 RAS_MeshSlot::~RAS_MeshSlot()
@@ -81,12 +82,13 @@ RAS_MeshSlot::~RAS_MeshSlot()
 	}
 }
 
-RAS_MeshSlot::RAS_MeshSlot(const RAS_MeshSlot& slot)
+RAS_MeshSlot::RAS_MeshSlot(const RAS_MeshSlot& slot) : SG_QList()
 {
 	RAS_DisplayArrayList::iterator it;
 
 	m_clientObj = NULL;
 	m_pDeformer = NULL;
+	m_pDerivedMesh = NULL;
 	m_OpenGLMatrix = NULL;
 	m_mesh = slot.m_mesh;
 	m_bucket = slot.m_bucket;
@@ -279,6 +281,63 @@ void RAS_MeshSlot::AddPolygonVertex(int offset)
 		m_endindex++;
 }
 
+void RAS_MeshSlot::SetDeformer(RAS_Deformer* deformer)
+{
+	if (deformer && m_pDeformer != deformer) {
+		RAS_DisplayArrayList::iterator it;
+		if (deformer->ShareVertexArray()) {
+			// this deformer uses the base vertex array, first release the current ones
+			for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) {
+				(*it)->m_users--;
+				if((*it)->m_users == 0)
+					delete *it;
+			}
+			m_displayArrays.clear();
+			// then hook to the base ones
+			RAS_MeshMaterial *mmat = m_mesh->GetMeshMaterial(m_bucket->GetPolyMaterial());
+			if (mmat && mmat->m_baseslot) {
+				m_displayArrays = mmat->m_baseslot->m_displayArrays;
+				for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) {
+					(*it)->m_users++;
+				}
+			}
+		}
+		else {
+			// no sharing
+			// we create local copy of RAS_DisplayArray when we have a deformer:
+			// this way we can avoid conflict between the vertex cache of duplicates
+			for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) {
+				if (deformer->UseVertexArray()) {
+					// the deformer makes use of vertex array, make sure we have our local copy
+					if ((*it)->m_users > 1) {
+						// only need to copy if there are other users
+						// note that this is the usual case as vertex arrays are held by the material base slot
+						RAS_DisplayArray *newarray = new RAS_DisplayArray(*(*it));
+						newarray->m_users = 1;
+						(*it)->m_users--;
+						*it = newarray;
+					}
+				} else {
+					// the deformer is not using vertex array (Modifier), release them
+					(*it)->m_users--;
+					if((*it)->m_users == 0)
+						delete *it;
+				}
+			}
+			if (!deformer->UseVertexArray()) {
+				m_displayArrays.clear();
+				m_startarray = 0;
+				m_startvertex = 0;
+				m_startindex = 0;
+				m_endarray = 0;
+				m_endvertex = 0;
+				m_endindex = 0;
+			}
+		}
+	}
+	m_pDeformer = deformer;
+}
+
 bool RAS_MeshSlot::Equals(RAS_MeshSlot *target)
 {
 	if(!m_OpenGLMatrix || !target->m_OpenGLMatrix)
@@ -422,21 +481,21 @@ bool RAS_MeshSlot::Split(bool force)
 	return false;
 }
 
+
+#ifdef USE_SPLIT	
 bool RAS_MeshSlot::IsCulled()
 {
-	list<RAS_MeshSlot*>::iterator it;
-
 	if(m_joinSlot)
 		return true;
 	if(!m_bCulled)
 		return false;
-#ifdef USE_SPLIT	
+	list<RAS_MeshSlot*>::iterator it;
 	for(it=m_joinedSlots.begin(); it!=m_joinedSlots.end(); it++)
 		if(!(*it)->m_bCulled)
 			return false;
-#endif	
 	return true;
 }
+#endif	
 
 /* material bucket sorting */
 
@@ -558,7 +617,7 @@ void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRa
 	// then it won't have texture coordinates for actual drawing. also
 	// for zsort we can't make a display list, since the polygon order
 	// changes all the time.
-	if(ms.m_pDeformer)
+	if(ms.m_pDeformer && ms.m_pDeformer->IsDynamic())
 		ms.m_bDisplayList = false;
 	else if(!ms.m_DisplayList && rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW)
 		ms.m_bDisplayList = false;