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

diff --git a/projectfiles_vc9/blender/render/BRE_render.vcproj b/projectfiles_vc9/blender/render/BRE_render.vcproj
new file mode 100644
index 00000000000..27b2163f20c
--- /dev/null
+++ b/projectfiles_vc9/blender/render/BRE_render.vcproj
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="BRE_render"

+	ProjectGUID="{106AE171-0083-41D6-A949-20DB0E8DC251}"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Blender Release|Win32"

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

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

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\render\BRE_render.pch"

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

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

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

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

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

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Blender Debug|Win32"

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

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

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;_USE_MATH_DEFINES"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\render\debug\BRE_render.pch"

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

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

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

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

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

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

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

+			>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\convertblender.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\envmap.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\gammaCorrectionTables.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\imagetexture.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\initrender.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\occlusion.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\pipeline.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\pixelblending.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\pixelshading.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\rayshade.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\raytrace.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\rendercore.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\renderdatabase.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\shadbuf.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\shadeinput.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\shadeoutput.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\sss.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\strand.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\sunsky.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\texture.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\source\zbuf.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

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

+			>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\edgeRender.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\envmap.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\gammaCorrectionTables.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\initrender.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\occlusion.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\old_zbuffer_types.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\pixelblending.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\pixelblending_types.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\pixelshading.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\extern\include\RE_pipeline.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\extern\include\RE_render_ext.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\extern\include\RE_shader_ext.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\rendercore.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\rendercore_int.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\renderdatabase.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\renderpipeline.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\shadbuf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\shading.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\sss.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\strand.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\sunsky.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\texture.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\vanillaRenderPipe_int.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\zbuf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\render\intern\include\zbuf_int.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>