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, 3 insertions, 1 deletions

diff --git a/release/scripts/md2_import.py b/release/scripts/md2_import.py
index e39b2ca85ec..f52746259a6 100644
--- a/release/scripts/md2_import.py
+++ b/release/scripts/md2_import.py
@@ -10,7 +10,7 @@ Tooltip: 'Import from Quake file format (.md2).'
 __author__ = 'Bob Holcomb'
 __version__ = '0.16'
 __url__ = ["Bob's site, http://bane.servebeer.com",
-     "Support forum, http://scourage.servebeer.com/phpbb/", "blender", "elysiun"]
+     "Support forum, http://scourage.servebeer.com/phpbb/", "blender", "blenderartists.org"]
 __email__ = ["Bob Holcomb, bob_holcomb:hotmail*com", "scripts"]
 __bpydoc__ = """\
 This script imports a Quake 2 file (MD2), textures, 
@@ -448,6 +448,8 @@ def load_md2(md2_filename, texture_filename):
 	
 	w = float(md2.skin_width)
 	h = float(md2.skin_height)
+	if w <= 0.0: w = 1.0
+	if h <= 0.0: h = 1.0
 	#for some reason quake2 texture maps are upside down, flip that
 	uv_list = [Vector(co.u/w, 1-(co.v/h)) for co in md2.tex_coords]
 	del w, h