[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21286] branches/soc-2009-yukishiro: merge till 21281

Jingyuan Huang jingyuan.huang at gmail.com
Wed Jul 1 15:24:03 CEST 2009


Revision: 21286
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21286
Author:   yukishiro
Date:     2009-07-01 15:24:03 +0200 (Wed, 01 Jul 2009)

Log Message:
-----------
merge till 21281

Modified Paths:
--------------
    branches/soc-2009-yukishiro/CMakeLists.txt
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/kernel/system/SYS_system.vcproj
    branches/soc-2009-yukishiro/release/ui/buttons_particle.py
    branches/soc-2009-yukishiro/release/ui/space_buttons.py
    branches/soc-2009-yukishiro/release/ui/space_filebrowser.py
    branches/soc-2009-yukishiro/release/ui/space_image.py
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_packedFile.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_particle.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_report.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/font.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/report.c
    branches/soc-2009-yukishiro/source/blender/blenlib/BLI_util.h
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/storage.c
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/util.c
    branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/view2d_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_panels.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/fsmenu.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/fsmenu.h
    branches/soc-2009-yukishiro/source/blender/editors/space_file/space_file.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/image_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/space_image.c
    branches/soc-2009-yukishiro/source/blender/editors/space_info/info_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_info/space_info.c
    branches/soc-2009-yukishiro/source/blender/editors/space_text/space_text.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_context.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_image.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2009-yukishiro/source/blender/python/generic/Geometry.c
    branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.c
    branches/soc-2009-yukishiro/source/blender/python/generic/euler.c
    branches/soc-2009-yukishiro/source/blender/python/generic/euler.h
    branches/soc-2009-yukishiro/source/blender/python/generic/matrix.c
    branches/soc-2009-yukishiro/source/blender/python/generic/matrix.h
    branches/soc-2009-yukishiro/source/blender/python/generic/quat.c
    branches/soc-2009-yukishiro/source/blender/python/generic/quat.h
    branches/soc-2009-yukishiro/source/blender/python/generic/vector.c
    branches/soc-2009-yukishiro/source/blender/python/generic/vector.h
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2009-yukishiro/source/creator/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyMath.cpp

Added Paths:
-----------
    branches/soc-2009-yukishiro/release/ui/space_info.py
    branches/soc-2009-yukishiro/source/blender/editors/space_info/info_ops.c

Removed Paths:
-------------
    branches/soc-2009-yukishiro/source/blender/editors/space_info/info_header.c

Property Changed:
----------------
    branches/soc-2009-yukishiro/release/ui/space_filebrowser.py
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_panels.c

Modified: branches/soc-2009-yukishiro/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/CMakeLists.txt	2009-07-01 13:07:28 UTC (rev 21285)
+++ branches/soc-2009-yukishiro/CMakeLists.txt	2009-07-01 13:24:03 UTC (rev 21286)
@@ -192,10 +192,10 @@
   ENDIF(CMAKE_CL_64)
 
   SET(PYTHON ${LIBDIR}/python)
-  SET(PYTHON_VERSION 2.5)
+  SET(PYTHON_VERSION 2.6)
   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
   SET(PYTHON_BINARY python)
-  SET(PYTHON_LIB python25)
+  SET(PYTHON_LIB python26)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   IF(CMAKE_CL_64)

Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj	2009-07-01 13:07:28 UTC (rev 21285)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj	2009-07-01 13:24:03 UTC (rev 21286)
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -197,7 +197,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -274,7 +274,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"

Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.vcproj	2009-07-01 13:07:28 UTC (rev 21285)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.vcproj	2009-07-01 13:24:03 UTC (rev 21286)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list