[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22140] branches/soc-2009-jaguarandi: svn merge -r 22111:22138 https://svn.blender.org/svnroot/bf-blender/ branches/blender2.5/blender

André Pinto andresusanopinto at gmail.com
Sun Aug 2 13:11:15 CEST 2009


Revision: 22140
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22140
Author:   jaguarandi
Date:     2009-08-02 13:11:15 +0200 (Sun, 02 Aug 2009)

Log Message:
-----------
svn merge -r 22111:22138 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

Modified Paths:
--------------
    branches/soc-2009-jaguarandi/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2009-jaguarandi/po/ja.po
    branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blender.sln
    branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2009-jaguarandi/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-jaguarandi/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
    branches/soc-2009-jaguarandi/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2009-jaguarandi/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soc-2009-jaguarandi/release/ui/buttons_data_mesh.py
    branches/soc-2009-jaguarandi/release/ui/buttons_material.py
    branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/armature.c
    branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/key.c
    branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_vfontdata.h
    branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_filter.c
    branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_header.c
    branches/soc-2009-jaguarandi/source/blender/editors/space_graph/space_graph.c
    branches/soc-2009-jaguarandi/source/blender/editors/space_time/time_header.c
    branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_generics.c
    branches/soc-2009-jaguarandi/source/blender/imbuf/intern/targa.c
    branches/soc-2009-jaguarandi/source/blender/makesdna/intern/makesdna.c
    branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm.c
    branches/soc-2009-jaguarandi/source/darwin/Makefile
    branches/soc-2009-jaguarandi/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2009-jaguarandi/source/nan_definitions.mk

Added Paths:
-----------
    branches/soc-2009-jaguarandi/intern/smoke/make/
    branches/soc-2009-jaguarandi/intern/smoke/make/msvc_9_0/
    branches/soc-2009-jaguarandi/intern/smoke/make/msvc_9_0/smoke.vcproj

Removed Paths:
-------------
    branches/soc-2009-jaguarandi/intern/smoke/make/msvc_9_0/
    branches/soc-2009-jaguarandi/intern/smoke/make/msvc_9_0/smoke.vcproj
    branches/soc-2009-jaguarandi/source/blender/blenlib/intern/psfont.c

Modified: branches/soc-2009-jaguarandi/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp	2009-08-02 11:05:13 UTC (rev 22139)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp	2009-08-02 11:11:15 UTC (rev 22140)
@@ -155,11 +155,9 @@
 	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 @@
 
 	// 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.

Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.h	2009-08-02 11:05:13 UTC (rev 22139)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.h	2009-08-02 11:11:15 UTC (rev 22140)
@@ -258,7 +258,7 @@
 	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

Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp	2009-08-02 11:05:13 UTC (rev 22139)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp	2009-08-02 11:11:15 UTC (rev 22140)
@@ -187,6 +187,8 @@
 		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.
 

Copied: branches/soc-2009-jaguarandi/intern/smoke/make (from rev 22138, branches/blender2.5/blender/intern/smoke/make)

Copied: branches/soc-2009-jaguarandi/intern/smoke/make/msvc_9_0 (from rev 22138, branches/blender2.5/blender/intern/smoke/make/msvc_9_0)

Deleted: branches/soc-2009-jaguarandi/intern/smoke/make/msvc_9_0/smoke.vcproj
===================================================================
--- branches/blender2.5/blender/intern/smoke/make/msvc_9_0/smoke.vcproj	2009-08-02 10:32:52 UTC (rev 22138)
+++ branches/soc-2009-jaguarandi/intern/smoke/make/msvc_9_0/smoke.vcproj	2009-08-02 11:11:15 UTC (rev 22140)
@@ -1,511 +0,0 @@
-<?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"
-			/>

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list