svn 2.5 branch merge r22138 to r22143

4 files changed, 517 insertions, 6 deletions

diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index e5e88502f45..dbdb65a14f4 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -155,11 +155,9 @@ init(
 	GHOST_TSuccess success = GHOST_System::init();
 
 	if (success) {
-		m_keyboard_vector = new char[32];
-
 		m_displayManager = new GHOST_DisplayManagerX11(this);
 
-		if (m_keyboard_vector && m_displayManager) {
+		if (m_displayManager) {
 			return GHOST_kSuccess;
 		}
 	}
@@ -715,9 +713,9 @@ getModifierKeys(
 
 	// analyse the masks retuned from XQueryPointer.
 
-	memset(m_keyboard_vector,0,sizeof(m_keyboard_vector));
+	memset((void *)m_keyboard_vector,0,sizeof(m_keyboard_vector));
 
-	XQueryKeymap(m_display,m_keyboard_vector);
+	XQueryKeymap(m_display,(char *)m_keyboard_vector);
 
 	// now translate key symobols into keycodes and
 	// test with vector.
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index 711a188ffe9..afd960d1ec3 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -258,7 +258,7 @@ private :
 	GHOST_TUns64 m_start_time;
 
 	/// A vector of keyboard key masks
-	char *m_keyboard_vector;
+	char m_keyboard_vector[32];
 
 	/**
 	 * Return the ghost window associated with the
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 1525b4eb16d..41c62be0966 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -187,6 +187,8 @@ GHOST_WindowX11(
 		printf("%s:%d: X11 glxChooseVisual() failed for OpenGL, verify working openGL system!\n", __FILE__, __LINE__);
 		return;
 	}
+	
+	memset(&m_xtablet, 0, sizeof(m_xtablet));
 
 	// Create a bunch of attributes needed to create an X window.
 
diff --git a/intern/smoke/make/msvc_9_0/smoke.vcproj b/intern/smoke/make/msvc_9_0/smoke.vcproj
new file mode 100644
index 00000000000..aa3779031f0
--- /dev/null
+++ b/intern/smoke/make/msvc_9_0/smoke.vcproj
@@ -0,0 +1,511 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="INT_smoke"

+	ProjectGUID="{E8904FB3-F8F7-BC21-87A6-029A57B901F4}"

+	RootNamespace="smoke"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Blender Release|Win32"

+			OutputDirectory="..\..\..\..\..\build\msvc_9\intern\smoke"

+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\smoke"

+			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="2"

+				AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"

+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\smoke\smoke.pch"

+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\smoke\"

+				ObjectFile="..\..\..\..\..\build\msvc_9\intern\smoke\"

+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\smoke\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1043"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libsmoke.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Copying IK files library to lib tree."

+				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Blender Debug|Win32"

+			OutputDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\debug"

+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\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="..\..\intern;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"

+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\smoke\debug\smoke.pch"

+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\smoke\debug\"

+				ObjectFile="..\..\..\..\..\build\msvc_9\intern\smoke\debug\"

+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\smoke\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1043"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libsmoke.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Copying IK files library (debug target) to lib tree."

+				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="3DPlugin Release|Win32"

+			OutputDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll"

+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll"

+			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="2"

+				AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"

+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\smoke.pch"

+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\"

+				ObjectFile="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\"

+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1043"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libsmoke.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Copying IK files library to lib tree."

+				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="3DPlugin Debug|Win32"

+			OutputDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug"

+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\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="..\..\intern;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"

+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug\smoke.pch"

+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug\"

+				ObjectFile="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug\"

+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1043"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

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

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Copying IK files library (debug target) to lib tree."

+				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="intern"

+			>

+			<File

+				RelativePath="..\..\intern\EIGENVALUE_HELPER.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\FFT_NOISE.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\FLUID_3D.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\FLUID_3D.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\FLUID_3D_SOLVERS.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\FLUID_3D_STATIC.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\IMAGE.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\INTERPOLATE.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\LU_HELPER.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\MERSENNETWISTER.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\OBSTACLE.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\smoke_API.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SPHERE.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SPHERE.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\VEC3.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\WAVELET_NOISE.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\WTURBULENCE.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\WTURBULENCE.h"

+				>

+			</File>

+			<Filter

+				Name="TNT"

+				>

+				<File

+					RelativePath="..\..\intern\tnt\jama_eig.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\jama_lu.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_array1d.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_array1d_utils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_array2d.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_array2d_utils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_array3d.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_array3d_utils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_cmat.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_fortran_array1d.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_fortran_array1d_utils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_fortran_array2d.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_fortran_array2d_utils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_fortran_array3d.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_fortran_array3d_utils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_i_refvec.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_math_utils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_sparse_matrix_csr.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_stopwatch.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_subscript.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_vec.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\intern\tnt\tnt_version.h"

+					>

+				</File>

+			</Filter>

+		</Filter>

+		<Filter

+			Name="extern"

+			>

+			<File

+				RelativePath="..\..\extern\smoke_API.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>