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

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

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="BL_nodes"

+	ProjectGUID="{4C3AB78A-52CA-4276-A041-39776E52D8C8}"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="BlenderPlayer Debug|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

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

+			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\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2"

+				MinimalRebuild="false"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

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

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

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

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

+				WarningLevel="2"

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

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

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="BlenderPlayer Release|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

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

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2"

+				BasicRuntimeChecks="0"

+				RuntimeLibrary="0"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\nodes\nodes.pch"

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

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

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

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

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

+			/>

+			<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\nodes\debug"

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

+			ConfigurationType="4"

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

+			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\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_OPENEXR"

+				MinimalRebuild="false"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

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

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

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

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

+				WarningLevel="2"

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

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

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Blender Release|Win32"

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

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

+			ConfigurationType="4"

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

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2, WITH_OPENEXR"

+				BasicRuntimeChecks="0"

+				RuntimeLibrary="0"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\nodes\nodes.pch"

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

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

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

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

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

+			/>

+			<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;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\..\..\source\blender\nodes\intern\CMP_util.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\nodes\intern\node_util.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\nodes\intern\SHD_util.c"

+				>

+			</File>

+			<Filter

+				Name="CMP_nodes"

+				>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_alphaOver.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_bilateralblur.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_blur.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_brightness.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_channelMatte.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_chromaMatte.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_colorSpill.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_composite.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_crop.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_curves.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_defocus.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_diffMatte.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_dilate.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_directionalblur.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_displace.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_filter.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_flip.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_gamma.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_glare.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_hueSatVal.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_idMask.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_image.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_invert.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_lensdist.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_lummaMatte.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_mapUV.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_mapValue.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_math.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_mixrgb.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_normal.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_normalize.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_outputFile.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_premulkey.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_rgb.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_rotate.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_scale.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_sepcombHSVA.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_sepcombRGBA.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_sepcombYCCA.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_sepcombYUVA.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_setalpha.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_splitViewer.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_texture.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_tonemap.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_translate.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_valToRgb.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_value.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_vecBlur.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_viewer.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_zcombine.c"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="SHD_nodes"

+				>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_camera.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_curves.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_dynamic.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_geom.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_hueSatVal.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_invert.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_mapping.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_material.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_math.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_mixRgb.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_normal.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_output.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_rgb.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_sepcombRGB.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_squeeze.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_texture.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_valToRgb.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_value.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_vectMath.c"

+					>

+				</File>

+			</Filter>

+		</Filter>

+		<Filter

+			Name="Header Files"

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

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\..\..\source\blender\nodes\CMP_node.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\source\blender\nodes\SHD_node.h"

+				>

+			</File>

+			<Filter

+				Name="intern"

+				>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_util.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\node_util.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_util.h"

+					>

+				</File>

+			</Filter>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>