Revision: 27861
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27861
Author: blendix
Date: 2010-03-30 12:49:52 +0200 (Tue, 30 Mar 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27742:27859
Modified Paths:
--------------
branches/render25/intern/elbeem/CMakeLists.txt
branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/render25/intern/smoke/CMakeLists.txt
branches/render25/projectfiles_vc9/blender/blender.sln
branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/render25/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/render25/release/VERSION
branches/render25/release/scripts/io/export_obj.py
branches/render25/release/scripts/io/export_ply.py
branches/render25/release/scripts/io/netrender/client.py
branches/render25/release/scripts/op/wm.py
branches/render25/release/scripts/ui/properties_data_curve.py
branches/render25/release/scripts/ui/properties_data_modifier.py
branches/render25/release/scripts/ui/properties_object.py
branches/render25/release/scripts/ui/properties_texture.py
branches/render25/release/scripts/ui/space_image.py
branches/render25/release/scripts/ui/space_info.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/source/blender/blenfont/intern/blf_font.c
branches/render25/source/blender/blenkernel/BKE_curve.h
branches/render25/source/blender/blenkernel/BKE_image.h
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/collision.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/curve.c
branches/render25/source/blender/blenkernel/intern/depsgraph.c
branches/render25/source/blender/blenkernel/intern/displist.c
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/material.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenkernel/intern/writeframeserver.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/blenloader/intern/writefile.c
branches/render25/source/blender/editors/curve/curve_ops.c
branches/render25/source/blender/editors/datafiles/B.blend.c
branches/render25/source/blender/editors/gpencil/gpencil_paint.c
branches/render25/source/blender/editors/include/ED_render.h
branches/render25/source/blender/editors/include/ED_view3d.h
branches/render25/source/blender/editors/interface/interface.c
branches/render25/source/blender/editors/interface/interface_intern.h
branches/render25/source/blender/editors/interface/interface_ops.c
branches/render25/source/blender/editors/interface/resources.c
branches/render25/source/blender/editors/interface/view2d_ops.c
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/mesh/mesh_ops.c
branches/render25/source/blender/editors/mesh/meshtools.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_bake.c
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/object/object_relations.c
branches/render25/source/blender/editors/render/render_intern.h
branches/render25/source/blender/editors/render/render_internal.c
branches/render25/source/blender/editors/render/render_opengl.c
branches/render25/source/blender/editors/render/render_ops.c
branches/render25/source/blender/editors/render/render_preview.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/screen/screen_edit.c
branches/render25/source/blender/editors/sculpt_paint/sculpt.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/file_ops.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_file/writeimage.c
branches/render25/source/blender/editors/space_image/SConscript
branches/render25/source/blender/editors/space_image/image_buttons.c
branches/render25/source/blender/editors/space_image/image_draw.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_node/node_draw.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_view3d/drawvolume.c
branches/render25/source/blender/editors/space_view3d/view3d_header.c
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform.h
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/editors/transform/transform_generics.c
branches/render25/source/blender/editors/transform/transform_ops.c
branches/render25/source/blender/editors/transform/transform_snap.c
branches/render25/source/blender/editors/uvedit/uvedit_draw.c
branches/render25/source/blender/editors/uvedit/uvedit_ops.c
branches/render25/source/blender/gpu/intern/gpu_extensions.c
branches/render25/source/blender/makesdna/DNA_image_types.h
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesdna/DNA_view2d_types.h
branches/render25/source/blender/makesrna/intern/rna_curve.c
branches/render25/source/blender/makesrna/intern/rna_define.c
branches/render25/source/blender/makesrna/intern/rna_modifier.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_render.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/render25/source/blender/python/doc/epy/BGL.py
branches/render25/source/blender/python/generic/bgl.c
branches/render25/source/blender/render/extern/include/RE_pipeline.h
branches/render25/source/blender/render/intern/source/bake.c
branches/render25/source/blender/render/intern/source/pipeline.c
branches/render25/source/blender/render/intern/source/result.c
branches/render25/source/blender/render/intern/source/sss.c
branches/render25/source/blender/render/intern/source/texture_envmap.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
branches/render25/source/blender/windowmanager/intern/wm_init_exit.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blender/windowmanager/intern/wm_window.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/render25/source/creator/creator.c
branches/render25/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/render25/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/render25/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/render25/source/gameengine/Ketsji/KX_GameObject.cpp
branches/render25/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/render25/source/gameengine/Ketsji/KX_Scene.cpp
branches/render25/source/gameengine/Ketsji/KX_Scene.h
branches/render25/source/gameengine/PyDoc/GameTypes.py
branches/render25/source/gameengine/PyDoc/VideoTexture.py
branches/render25/source/gameengine/SceneGraph/SG_Node.cpp
branches/render25/source/gameengine/SceneGraph/SG_Node.h
branches/render25/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/render25/source/gameengine/VideoTexture/VideoFFmpeg.h
Added Paths:
-----------
branches/render25/source/gameengine/PyDoc/how_to_build_win.txt
Modified: branches/render25/intern/elbeem/CMakeLists.txt
===================================================================
--- branches/render25/intern/elbeem/CMakeLists.txt 2010-03-30 10:13:55 UTC
(rev 27860)
+++ branches/render25/intern/elbeem/CMakeLists.txt 2010-03-30 10:49:52 UTC
(rev 27861)
@@ -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/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-03-30
10:13:55 UTC (rev 27860)
+++ branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-03-30
10:49:52 UTC (rev 27861)
@@ -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/render25/intern/smoke/CMakeLists.txt
===================================================================
--- branches/render25/intern/smoke/CMakeLists.txt 2010-03-30 10:13:55 UTC
(rev 27860)
+++ branches/render25/intern/smoke/CMakeLists.txt 2010-03-30 10:49:52 UTC
(rev 27861)
@@ -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/render25/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/render25/projectfiles_vc9/blender/blender.sln 2010-03-30
10:13:55 UTC (rev 27860)
+++ branches/render25/projectfiles_vc9/blender/blender.sln 2010-03-30
10:49:52 UTC (rev 27861)
@@ -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/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2010-03-30 10:13:55 UTC (rev 27860)
+++ branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2010-03-30 10:49:52 UTC (rev 27861)
@@ -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
RNA_makesrna.exe
rna.c
"
+ CommandLine="CD
..\..\..\source\blender\makesrna\intern\
$(TargetDir)\RNA_makesrna.exe
..\..\..\..\..\build\msvc_9\source\blender\makesrna
"
/>
</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\
RNA_makesrna.exe
.\
"
+ CommandLine="CD
..\..\..\source\blender\makesrna\intern\
$(TargetDir)RNA_makesrna.exe
..\..\..\..\..\build\msvc_9\source\blender\makesrna\
"
/>
</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"
+ OutputFile="$(OutDir)\RNA_makesrna.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
@@ -293,7 +293,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
