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, 209 insertions, 0 deletions

diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp
new file mode 100644
index 00000000000..3f939de6bc2
--- /dev/null
+++ b/source/gameengine/VideoTexture/Exception.cpp
@@ -0,0 +1,209 @@
+/* $Id$
+-----------------------------------------------------------------------------
+This source file is part of VideoTexture library
+
+Copyright (c) 2006 The Zdeno Ash Miklas
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+
+#include <strstream>
+#include <fstream>
+
+#include <PyObjectPlus.h>
+
+#include "Exception.h"
+
+
+// exception identificators
+ExceptionID ErrGeneral, ErrNotFound;
+
+// exception descriptions
+ExpDesc errGenerDesc (ErrGeneral, "General Error");
+ExpDesc errNFoundDesc (ErrNotFound, "Error description not found");
+
+
+
+// implementation of ExpDesc
+
+// constructor
+ExpDesc::ExpDesc (ExceptionID & exp, char * desc, RESULT hres) 
+: m_expID(exp), m_hRslt(hres), m_description(desc)
+{
+}
+
+// destructor
+ExpDesc::~ExpDesc (void) {}
+
+// list of descriptions
+std::vector<ExpDesc*> ExpDesc::m_expDescs;
+
+
+// class Exception
+
+
+// last exception description
+std::string Exception::m_lastError;
+
+// log file name
+char * Exception::m_logFile = NULL;
+
+
+// basic constructor
+Exception::Exception ()
+{
+	// default values
+	m_expID = &ErrNotFound;
+	m_hRslt = S_OK;
+	m_line = 0;
+}
+
+
+// destructor
+Exception::~Exception () throw() { }
+
+
+// copy constructor
+Exception::Exception (const Exception & xpt)
+{ copy (xpt); }
+
+
+// assignment operator
+Exception & Exception::operator= (const Exception & xpt)
+{ copy (xpt); return *this; }
+
+
+// get exception description
+const char * Exception::what()
+{
+	// set exception description
+	setXptDesc();
+	// return c string
+	return m_desc.c_str();
+}
+
+
+// debug version - with file and line of exception
+Exception::Exception (ExceptionID & expID, RESULT rslt, char * fil, int lin)
+: m_expID (&expID), m_hRslt (rslt)
+{
+	// set file and line
+	if (strlen(fil) > 0 || lin > 0)
+		setFileLine (fil, lin);
+}
+
+
+// set file and line
+void Exception::setFileLine (char * fil, int lin)
+{
+	if (fil != NULL) m_fileName = fil;
+	m_line = lin;
+}
+
+
+// report exception
+void Exception::report(void)
+{
+	// set exception description
+	setXptDesc();
+	// set python error
+	PyErr_SetString(PyExc_RuntimeError, what());
+	// if log file is set
+	if (m_logFile != NULL)
+	{
+		// write description to log
+		std::ofstream logf (m_logFile, std::ios_base::app);
+		logf << m_fileName << ':' << m_line << ':' << m_desc << std::endl;
+		logf.flush();
+		logf.close();
+	}
+}
+
+
+// set exception description
+void Exception::setXptDesc (void)
+{
+	// if description is not set
+	if (m_desc.size() == 0)
+	{
+		// start of search                           -1
+		// found description "NotFound"               0
+		// found description without matching result  1
+		// found description with matching result     2
+		int best = -1;
+		// find exception description
+		for (std::vector<ExpDesc*>::iterator it = ExpDesc::m_expDescs.begin(); it != ExpDesc::m_expDescs.end(); ++it)
+		{
+			// use "NotFound", if there is not better
+			if (best < 0 && (*it)->isExp(&ErrNotFound) > 0)
+			{
+				(*it)->loadDesc(m_desc);
+				best = 0;
+			}
+			// match exception
+			int nBest = (*it)->isExp(m_expID, m_hRslt);
+			// if exception is matching better
+			if (nBest > 0 && best < nBest)
+			{
+				// set description
+				(*it)->loadDesc(m_desc);
+				best = nBest;
+				// if matching exactly, finish search
+				if (best == 2) break;
+			}
+		}
+		// add result code
+		// length of result code
+		const size_t rsltSize = 11;
+		// delimit description
+		const char delimRslt[] = ": ";
+		// set text of description
+		char rsltTxt[rsltSize];
+		std::ostrstream os(rsltTxt, rsltSize);
+		os << std::hex << m_hRslt << delimRslt << '\0';
+		// copy result to description
+		m_desc.insert(0, rsltTxt);
+		// copy exception description to last exception string
+		m_lastError = m_desc;
+	}
+}
+
+
+// copy exception data
+void Exception::copy (const Exception & xpt)
+{
+	// standard data
+	m_expID = xpt.m_expID;
+	m_hRslt = xpt.m_hRslt;
+	m_desc = xpt.m_desc;
+
+	// debug data
+	m_fileName = xpt.m_fileName;
+	m_line = xpt.m_line;
+}
+
+void registerAllExceptions(void)
+{
+    errGenerDesc.registerDesc();
+    errNFoundDesc.registerDesc();
+    MaterialNotAvailDesc.registerDesc();
+    ImageSizesNotMatchDesc.registerDesc();
+    SceneInvalidDesc.registerDesc();
+    CameraInvalidDesc.registerDesc();
+    SourceVideoEmptyDesc.registerDesc();
+    SourceVideoCreationDesc.registerDesc();
+}