[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14761] branches/soc-2008-jaguarandi: Merge from trunk
André Pinto
andresusanopinto at gmail.com
Fri May 9 13:57:52 CEST 2008
Revision: 14761
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14761
Author: jaguarandi
Date: 2008-05-09 13:57:52 +0200 (Fri, 09 May 2008)
Log Message:
-----------
Merge from trunk
svn merge -r 14692:14760 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/soc-2008-jaguarandi/release/scripts/bpymodules/BPyAddMesh.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/collada.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/cutils.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/translator.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/dxfReader.py
branches/soc-2008-jaguarandi/release/scripts/colladaImport14.py
branches/soc-2008-jaguarandi/release/scripts/vrml97_export.py
branches/soc-2008-jaguarandi/release/scripts/x3d_export.py
branches/soc-2008-jaguarandi/source/Makefile
branches/soc-2008-jaguarandi/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/action.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/anim.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/blender.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/mball.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-jaguarandi/source/blender/blenloader/intern/readfile.c
branches/soc-2008-jaguarandi/source/blender/imbuf/intern/util.c
branches/soc-2008-jaguarandi/source/blender/include/BDR_editface.h
branches/soc-2008-jaguarandi/source/blender/include/BIF_imasel.h
branches/soc-2008-jaguarandi/source/blender/include/BIF_interface.h
branches/soc-2008-jaguarandi/source/blender/include/BSE_drawview.h
branches/soc-2008-jaguarandi/source/blender/include/BSE_filesel.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
branches/soc-2008-jaguarandi/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/soc-2008-jaguarandi/source/blender/python/BPY_interface.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Blender.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Material.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Sys.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Material.py
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Sys.py
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/epy_docgen.sh
branches/soc-2008-jaguarandi/source/blender/render/intern/source/envmap.c
branches/soc-2008-jaguarandi/source/blender/render/intern/source/rendercore.c
branches/soc-2008-jaguarandi/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_object.c
branches/soc-2008-jaguarandi/source/blender/src/drawimasel.c
branches/soc-2008-jaguarandi/source/blender/src/drawnla.c
branches/soc-2008-jaguarandi/source/blender/src/drawobject.c
branches/soc-2008-jaguarandi/source/blender/src/drawview.c
branches/soc-2008-jaguarandi/source/blender/src/editface.c
branches/soc-2008-jaguarandi/source/blender/src/editmesh_mods.c
branches/soc-2008-jaguarandi/source/blender/src/editnla.c
branches/soc-2008-jaguarandi/source/blender/src/editobject.c
branches/soc-2008-jaguarandi/source/blender/src/editseq.c
branches/soc-2008-jaguarandi/source/blender/src/filesel.c
branches/soc-2008-jaguarandi/source/blender/src/header_seq.c
branches/soc-2008-jaguarandi/source/blender/src/headerbuttons.c
branches/soc-2008-jaguarandi/source/blender/src/imasel.c
branches/soc-2008-jaguarandi/source/blender/src/interface.c
branches/soc-2008-jaguarandi/source/blender/src/interface_draw.c
branches/soc-2008-jaguarandi/source/blender/src/parametrizer.c
branches/soc-2008-jaguarandi/source/blender/src/parametrizer.h
branches/soc-2008-jaguarandi/source/blender/src/parametrizer_intern.h
branches/soc-2008-jaguarandi/source/blender/src/sequence.c
branches/soc-2008-jaguarandi/source/blender/src/space.c
branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c
branches/soc-2008-jaguarandi/source/blender/src/unwrapper.c
branches/soc-2008-jaguarandi/source/creator/creator.c
branches/soc-2008-jaguarandi/source/gameengine/BlenderRoutines/Makefile
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/Makefile
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/common/Makefile
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/ghost/Makefile
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-jaguarandi/source/gameengine/PyDoc/KX_GameObject.py
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/Makefile
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/soc-2008-jaguarandi/source/nan_definitions.mk
Removed Paths:
-------------
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/epy_docgen-3.sh
Modified: branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj 2008-05-09 11:10:37 UTC (rev 14760)
+++ branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj 2008-05-09 11:57:52 UTC (rev 14761)
@@ -75,7 +75,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
StringPooling="TRUE"
BasicRuntimeChecks="0"
RuntimeLibrary="0"
Modified: branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj 2008-05-09 11:10:37 UTC (rev 14760)
+++ branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj 2008-05-09 11:57:52 UTC (rev 14761)
@@ -180,7 +180,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
@@ -233,7 +233,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
- PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID"
+ PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
@@ -285,7 +285,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
Modified: branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj 2008-05-09 11:10:37 UTC (rev 14760)
+++ branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj 2008-05-09 11:57:52 UTC (rev 14761)
@@ -126,7 +126,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
@@ -230,7 +230,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
@@ -282,7 +282,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
Modified: branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj 2008-05-09 11:10:37 UTC (rev 14760)
+++ branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj 2008-05-09 11:57:52 UTC (rev 14761)
@@ -178,7 +178,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
@@ -230,7 +230,7 @@
Name="VCCLCompilerTool"
Optimization="0"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list