[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27818] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 27817.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Mon Mar 29 00:45:15 CEST 2010


Revision: 27818
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27818
Author:   kjym3
Date:     2010-03-29 00:45:14 +0200 (Mon, 29 Mar 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 27817.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27817

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.sln
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soc-2008-mxcurioni/release/VERSION
    branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
    branches/soc-2008-mxcurioni/release/scripts/op/wm.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/writeimage.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_image_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/soc-2008-mxcurioni/source/blender/python/doc/epy/BGL.py
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sss.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameTypes.py
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/VideoTexture.py
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoFFmpeg.h

Modified: branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt	2010-03-28 21:38:22 UTC (rev 27817)
+++ branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt	2010-03-28 22:45:14 UTC (rev 27818)
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC ${ZLIB_INC} ${PNG_INC} extern)
+SET(INC ${PNG_INC} ${ZLIB_INC} extern)
 
 FILE(GLOB SRC intern/*.cpp)
 

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm	2010-03-28 21:38:22 UTC (rev 27817)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm	2010-03-28 22:45:14 UTC (rev 27818)
@@ -813,6 +813,7 @@
 	GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow();
 	if (!window) return GHOST_kFailure;
 
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	NSScreen *windowScreen = window->getScreen();
 	NSRect screenRect = [windowScreen frame];
 	
@@ -825,6 +826,7 @@
 
 	CGDisplayMoveCursorToPoint((CGDirectDisplayID)[[[windowScreen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue], CGPointMake(xf, yf));
 
+	[pool drain];
     return GHOST_kSuccess;
 }
 

Modified: branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt	2010-03-28 21:38:22 UTC (rev 27817)
+++ branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt	2010-03-28 22:45:14 UTC (rev 27818)
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC ${ZLIB_INC} ${PNG_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
 
 FILE(GLOB SRC intern/*.cpp)
 

Modified: branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.sln	2010-03-28 21:38:22 UTC (rev 27817)
+++ branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.sln	2010-03-28 22:45:14 UTC (rev 27818)
@@ -259,6 +259,7 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_ghost", "..\..\intern\ghost\make\msvc_9_0\ghost.vcproj", "{76D90B92-ECC7-409C-9F98-A8814B90F3C0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A} = {BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
 		{B789C2F3-279E-4A85-8F0A-7F7AC068E598} = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
 	EndProjectSection
 EndProject

Modified: branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj	2010-03-28 21:38:22 UTC (rev 27817)
+++ branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj	2010-03-28 22:45:14 UTC (rev 27818)
@@ -27,7 +27,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"
+				CommandLine="del ..\..\..\..\build\msvc_9\source\blender\makesrna\rna_*_gen.c"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesrna\internal"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"
+				OutputFile="$(OutDir)\RNA_makesrna.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
@@ -106,13 +106,13 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Building RNA"
-				CommandLine="CD ..\..\..\source\blender\makesrna\intern&#x0D;&#x0A;RNA_makesrna.exe rna.c&#x0D;&#x0A;"
+				CommandLine="CD ..\..\..\source\blender\makesrna\intern\&#x0D;&#x0A;$(TargetDir)\RNA_makesrna.exe ..\..\..\..\..\build\msvc_9\source\blender\makesrna&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Blender Release|Win32"
-			OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna"
-			IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna"
+			OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\release"
+			IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -121,7 +121,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"
+				CommandLine="del ..\..\..\..\build\msvc_9\source\blender\makesrna\rna_*_gen.c"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -140,7 +140,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesrna\internal"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE;GAMEBLENDER=1;WITH_SDL;WITH_OPENAL;WITH_JACK"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -148,9 +148,9 @@
 				DefaultCharIsUnsigned="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesrna\DNA_makesrna.pch"
-				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\"
-				ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\"
-				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\"
+				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\release\"
+				ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\release\"
+				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\release\"
 				WarningLevel="2"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -169,7 +169,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"
+				OutputFile="$(OutDir)\RNA_makesrna.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
@@ -200,7 +200,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Building RNA"
-				CommandLine="CD ..\..\..\source\blender\makesrna\intern\&#x0D;&#x0A;RNA_makesrna.exe .\&#x0D;&#x0A;"
+				CommandLine="CD ..\..\..\source\blender\makesrna\intern\&#x0D;&#x0A;$(TargetDir)RNA_makesrna.exe ..\..\..\..\..\build\msvc_9\source\blender\makesrna\&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -215,7 +215,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"
+				CommandLine="del ..\..\..\..\build\msvc_9\source\blender\makesrna\rna_*_gen.c"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -233,7 +233,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesrna\internal"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -262,7 +262,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list