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

diff --git a/projectfiles_vc9/blender/img/BL_img.vcproj b/projectfiles_vc9/blender/img/BL_img.vcproj
new file mode 100644
index 00000000000..b4c4d1179b0
--- /dev/null
+++ b/projectfiles_vc9/blender/img/BL_img.vcproj
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.10"

+	Name="BL_img"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Blender Release|Win32"

+			OutputDirectory="..\..\..\..\build\msvc_9\source\blender\img"

+			IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\img"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"

+				StringPooling="TRUE"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="TRUE"

+				DefaultCharIsUnsigned="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\img\BL_img.pch"

+				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\img\"

+				ObjectFile="..\..\..\..\build\msvc_9\source\blender\img\"

+				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\img\"

+				WarningLevel="2"

+				SuppressStartupBanner="TRUE"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\build\msvc_9\libs\BL_img.lib"

+				SuppressStartupBanner="TRUE"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="Blender Debug|Win32"

+			OutputDirectory="..\..\..\..\build\msvc_9\source\blender\img\debug"

+			IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\img\debug"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				DefaultCharIsUnsigned="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\img\debug\BL_img.pch"

+				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\img\debug\"

+				ObjectFile="..\..\..\..\build\msvc_9\source\blender\img\debug\"

+				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\img\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="3"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\build\msvc_9\libs\debug\BL_img.lib"

+				SuppressStartupBanner="TRUE"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="3D Plugin Release|Win32"

+			OutputDirectory="..\..\..\..\build\msvc_9\source\blender\img\mtdll"

+			IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\img\mtdll"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"

+				StringPooling="TRUE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="TRUE"

+				DefaultCharIsUnsigned="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\img\mtdll\BL_img.pch"

+				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\img\mtdll\"

+				ObjectFile="..\..\..\..\build\msvc_9\source\blender\img\mtdll\"

+				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\img\mtdll\"

+				WarningLevel="2"

+				SuppressStartupBanner="TRUE"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\build\msvc_9\libs\mtdll\BL_img.lib"

+				SuppressStartupBanner="TRUE"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="3D Plugin Debug|Win32"

+			OutputDirectory="..\..\..\..\build\msvc_9\source\blender\img\mtdll\debug"

+			IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\img\mtdll\debug"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				DefaultCharIsUnsigned="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\img\mtdll\debug\BL_img.pch"

+				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\img\mtdll\debug\"

+				ObjectFile="..\..\..\..\build\msvc_9\source\blender\img\mtdll\debug\"

+				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\img\mtdll\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="3"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\build\msvc_9\libs\mtdll\debug\BL_img.lib"

+				SuppressStartupBanner="TRUE"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\source\blender\img\intern\IMG_Api.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\img\intern\IMG_BrushRGBA32.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\img\intern\IMG_CanvasRGBA32.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\img\intern\IMG_Line.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\img\intern\IMG_Pixmap.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\img\intern\IMG_PixmapRGBA32.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\img\intern\IMG_Rect.cpp">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+			<Filter

+				Name="intern"

+				Filter="">

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_BrushRGBA32.h">

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_CanvasRGBA32.h">

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_Color.h">

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_Line.h">

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_MemPtr.h">

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_Pixmap.h">

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_PixmapRGBA32.h">

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_Rect.h">

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\img\intern\IMG_Types.h">

+				</File>

+			</Filter>

+			<Filter

+				Name="extern"

+				Filter="">

+				<File

+					RelativePath="..\..\..\source\blender\img\IMG_Api.h">

+				</File>

+			</Filter>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>