Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 100 insertions, 0 deletions

diff --git a/source/gameengine/PyDoc/KX_PolyProxy.py b/source/gameengine/PyDoc/KX_PolyProxy.py
new file mode 100644
index 00000000000..bcd42c2ac2e
--- /dev/null
+++ b/source/gameengine/PyDoc/KX_PolyProxy.py
@@ -0,0 +1,100 @@
+# $Id$
+# Documentation for the polygon proxy class
+
+class KX_PolyProxy:
+	"""
+	A polygon holds the index of the vertex forming the poylgon.
+
+	Note: 
+	The polygon attributes are read-only, you need to retrieve the vertex proxy if you want
+	to change the vertex settings. 
+	
+	@ivar matname: The name of polygon material, empty if no material.
+	@type matname: string
+	@ivar material: The material of the polygon
+	@type material: L{KX_PolygonMaterial} or KX_BlenderMaterial
+	@ivar texture: The texture name of the polygon.
+	@type texture: string
+	@ivar matid: The material index of the polygon, use this to retrieve vertex proxy from mesh proxy
+	@type matid: integer
+	@ivar v1: vertex index of the first vertex of the polygon, use this to retrieve vertex proxy from mesh proxy
+	@type v1: integer	
+	@ivar v2: vertex index of the second vertex of the polygon, use this to retrieve vertex proxy from mesh proxy
+	@type v2: integer	
+	@ivar v3: vertex index of the third vertex of the polygon, use this to retrieve vertex proxy from mesh proxy
+	@type v3: integer	
+	@ivar v4: vertex index of the fourth vertex of the polygon, 0 if polygon has only 3 vertex
+	          use this to retrieve vertex proxy from mesh proxy
+	@type v4: integer	
+	@ivar visible: visible state of the polygon: 1=visible, 0=invisible
+	@type visible: integer
+	@ivar collide: collide state of the polygon: 1=receives collision, 0=collision free.
+	@type collide: integer
+	"""
+
+	def getMaterialName(): 
+		"""
+		Returns the polygon material name with MA prefix
+		
+		@rtype: string
+		@return: material name
+		"""
+	def getMaterial(): 
+		"""
+		Returns the polygon material
+		
+		@rtype: L{KX_PolygonMaterial} or KX_BlenderMaterial
+		"""
+	def getTextureName():
+		"""
+		Returns the polygon texture name
+		
+		@rtype: string
+		@return: texture name
+		"""
+	def getMaterialIndex():
+		"""
+		Returns the material bucket index of the polygon. 
+		This index and the ones returned by getVertexIndex() are needed to retrieve the vertex proxy from L{KX_MeshProxy}.
+		
+		@rtype: integer
+		@return: the material index in the mesh
+		"""
+	def getNumVertex(): 
+		"""
+		Returns the number of vertex of the polygon.
+		
+		@rtype: integer
+		@return: number of vertex, 3 or 4.
+		"""
+	def isVisible():
+		"""
+		Returns whether the polygon is visible or not
+		
+		@rtype: integer
+		@return: 0=invisible, 1=visible
+		"""
+	def isCollider():
+		"""
+		Returns whether the polygon is receives collision or not
+		
+		@rtype: integer
+		@return: 0=collision free, 1=receives collision
+		"""
+	def getVertexIndex(vertex):
+		"""
+		Returns the mesh vertex index of a polygon vertex
+		This index and the one returned by getMaterialIndex() are needed to retrieve the vertex proxy from L{KX_MeshProxy}.
+		
+		@type vertex: integer
+		@param vertex: index of the vertex in the polygon: 0->3
+		@rtype: integer
+		@return: mesh vertex index
+		"""
+	def getMesh():
+		"""
+		Returns a mesh proxy
+		
+		@rtype: L{KX_MeshProxy}
+		@return: mesh proxy
+		"""