[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22144] branches/soundsystem: svn 2. 5 branch merge r22138 to r22143
Jörg Müller
nexyon at gmail.com
Sun Aug 2 14:49:53 CEST 2009
Revision: 22144
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22144
Author: nexyon
Date: 2009-08-02 14:49:53 +0200 (Sun, 02 Aug 2009)
Log Message:
-----------
svn 2.5 branch merge r22138 to r22143
Modified Paths:
--------------
branches/soundsystem/CMakeLists.txt
branches/soundsystem/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.h
branches/soundsystem/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soundsystem/po/ja.po
branches/soundsystem/projectfiles_vc9/blender/blender.sln
branches/soundsystem/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soundsystem/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soundsystem/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soundsystem/release/ui/buttons_data_mesh.py
branches/soundsystem/release/ui/buttons_material.py
branches/soundsystem/release/ui/buttons_physics_field.py
branches/soundsystem/release/ui/buttons_scene.py
branches/soundsystem/release/ui/buttons_texture.py
branches/soundsystem/release/ui/buttons_world.py
branches/soundsystem/source/blender/blenkernel/intern/anim_sys.c
branches/soundsystem/source/blender/blenkernel/intern/armature.c
branches/soundsystem/source/blender/blenkernel/intern/fcurve.c
branches/soundsystem/source/blender/blenkernel/intern/ipo.c
branches/soundsystem/source/blender/blenkernel/intern/key.c
branches/soundsystem/source/blender/blenkernel/intern/packedFile.c
branches/soundsystem/source/blender/blenlib/BLI_vfontdata.h
branches/soundsystem/source/blender/editors/animation/anim_filter.c
branches/soundsystem/source/blender/editors/animation/keyframing.c
branches/soundsystem/source/blender/editors/include/ED_screen_types.h
branches/soundsystem/source/blender/editors/interface/interface_anim.c
branches/soundsystem/source/blender/editors/interface/interface_templates.c
branches/soundsystem/source/blender/editors/object/editkey.c
branches/soundsystem/source/blender/editors/screen/screen_edit.c
branches/soundsystem/source/blender/editors/screen/screen_ops.c
branches/soundsystem/source/blender/editors/space_graph/graph_header.c
branches/soundsystem/source/blender/editors/space_graph/space_graph.c
branches/soundsystem/source/blender/editors/space_nla/nla_buttons.c
branches/soundsystem/source/blender/editors/space_time/space_time.c
branches/soundsystem/source/blender/editors/space_time/time_header.c
branches/soundsystem/source/blender/editors/transform/transform.c
branches/soundsystem/source/blender/editors/transform/transform_generics.c
branches/soundsystem/source/blender/imbuf/intern/targa.c
branches/soundsystem/source/blender/makesdna/DNA_anim_types.h
branches/soundsystem/source/blender/makesdna/DNA_scene_types.h
branches/soundsystem/source/blender/makesdna/DNA_userdef_types.h
branches/soundsystem/source/blender/makesdna/intern/makesdna.c
branches/soundsystem/source/blender/makesrna/RNA_enum_types.h
branches/soundsystem/source/blender/makesrna/intern/rna_animation.c
branches/soundsystem/source/blender/makesrna/intern/rna_key.c
branches/soundsystem/source/blender/makesrna/intern/rna_material.c
branches/soundsystem/source/blender/makesrna/intern/rna_nla.c
branches/soundsystem/source/blender/makesrna/intern/rna_object_force.c
branches/soundsystem/source/blender/makesrna/intern/rna_space.c
branches/soundsystem/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/soundsystem/source/blender/windowmanager/intern/wm.c
branches/soundsystem/source/darwin/Makefile
branches/soundsystem/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soundsystem/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soundsystem/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/soundsystem/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soundsystem/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soundsystem/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soundsystem/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soundsystem/source/gameengine/Converter/KX_ConvertSensors.h
branches/soundsystem/source/gameengine/Expressions/Value.cpp
branches/soundsystem/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/soundsystem/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soundsystem/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soundsystem/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soundsystem/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_NearSensor.h
branches/soundsystem/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_RadarSensor.h
branches/soundsystem/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soundsystem/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soundsystem/source/nan_definitions.mk
Added Paths:
-----------
branches/soundsystem/intern/smoke/make/
branches/soundsystem/intern/smoke/make/msvc_9_0/
branches/soundsystem/intern/smoke/make/msvc_9_0/smoke.vcproj
Removed Paths:
-------------
branches/soundsystem/intern/smoke/make/msvc_9_0/
branches/soundsystem/intern/smoke/make/msvc_9_0/smoke.vcproj
branches/soundsystem/source/blender/blenlib/intern/psfont.c
Modified: branches/soundsystem/CMakeLists.txt
===================================================================
--- branches/soundsystem/CMakeLists.txt 2009-08-02 12:11:14 UTC (rev 22143)
+++ branches/soundsystem/CMakeLists.txt 2009-08-02 12:49:53 UTC (rev 22144)
@@ -392,11 +392,7 @@
SET(OPENEXR ${LIBDIR}/openexr)
SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
- IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
- ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(OPENEXR_LIB Iex Half IlmImf Imath)
- ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
SET(LLIBS stdc++ SystemStubs)
Modified: branches/soundsystem/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp 2009-08-02 12:11:14 UTC (rev 22143)
+++ branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp 2009-08-02 12:49:53 UTC (rev 22144)
@@ -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/soundsystem/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.h 2009-08-02 12:11:14 UTC (rev 22143)
+++ branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.h 2009-08-02 12:49:53 UTC (rev 22144)
@@ -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/soundsystem/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soundsystem/intern/ghost/intern/GHOST_WindowX11.cpp 2009-08-02 12:11:14 UTC (rev 22143)
+++ branches/soundsystem/intern/ghost/intern/GHOST_WindowX11.cpp 2009-08-02 12:49:53 UTC (rev 22144)
@@ -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/soundsystem/intern/smoke/make (from rev 22137, branches/blender2.5/blender/intern/smoke/make)
Copied: branches/soundsystem/intern/smoke/make/msvc_9_0 (from rev 22137, branches/blender2.5/blender/intern/smoke/make/msvc_9_0)
Deleted: branches/soundsystem/intern/smoke/make/msvc_9_0/smoke.vcproj
===================================================================
--- branches/blender2.5/blender/intern/smoke/make/msvc_9_0/smoke.vcproj 2009-08-02 10:16:31 UTC (rev 22137)
+++ branches/soundsystem/intern/smoke/make/msvc_9_0/smoke.vcproj 2009-08-02 12:49:53 UTC (rev 22144)
@@ -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
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include
ECHO Done
"
- />
- </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
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include
ECHO Done
"
- />
- </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\"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list