[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14832] branches/soc-2008-unclezeiv: svn merge -r 14673:14831 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Davide Vercelli davide.vercelli at gmail.com
Wed May 14 01:57:35 CEST 2008


Revision: 14832
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14832
Author:   unclezeiv
Date:     2008-05-14 01:57:35 +0200 (Wed, 14 May 2008)

Log Message:
-----------
svn merge -r 14673:14831 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/soc-2008-unclezeiv/release/Makefile
    branches/soc-2008-unclezeiv/release/scripts/3ds_export.py
    branches/soc-2008-unclezeiv/release/scripts/bevel_center.py
    branches/soc-2008-unclezeiv/release/scripts/blenderLipSynchro.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPyAddMesh.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/collada.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/cstartup.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/cutils.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/translator.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/dxfReader.py
    branches/soc-2008-unclezeiv/release/scripts/colladaImport14.py
    branches/soc-2008-unclezeiv/release/scripts/export_m3g.py
    branches/soc-2008-unclezeiv/release/scripts/hotkeys.py
    branches/soc-2008-unclezeiv/release/scripts/import_dxf.py
    branches/soc-2008-unclezeiv/release/scripts/object_apply_def.py
    branches/soc-2008-unclezeiv/release/scripts/paths_import.py
    branches/soc-2008-unclezeiv/release/scripts/render_save_layers.py
    branches/soc-2008-unclezeiv/release/scripts/rvk1_torvk2.py
    branches/soc-2008-unclezeiv/release/scripts/x3d_export.py
    branches/soc-2008-unclezeiv/source/Makefile
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_mball.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/action.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/image.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/mball.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_arithb.h
    branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2008-unclezeiv/source/blender/blenlib/intern/arithb.c
    branches/soc-2008-unclezeiv/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2008-unclezeiv/source/blender/blenlib/intern/edgehash.c
    branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-unclezeiv/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-unclezeiv/source/blender/imbuf/intern/util.c
    branches/soc-2008-unclezeiv/source/blender/include/BDR_editface.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_drawseq.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_editmesh.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_imasel.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_interface.h
    branches/soc-2008-unclezeiv/source/blender/include/BSE_drawview.h
    branches/soc-2008-unclezeiv/source/blender/include/BSE_filesel.h
    branches/soc-2008-unclezeiv/source/blender/include/butspace.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
    branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Blender.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Material.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Object.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Particle.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Particle.h
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Sys.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/API_intro.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Image.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Material.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Object.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Sys.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Texture.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/epy_docgen.sh
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/sceneRender.c
    branches/soc-2008-unclezeiv/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/envmap.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/imagetexture.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/rendercore.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c
    branches/soc-2008-unclezeiv/source/blender/src/drawaction.c
    branches/soc-2008-unclezeiv/source/blender/src/drawarmature.c
    branches/soc-2008-unclezeiv/source/blender/src/drawimage.c
    branches/soc-2008-unclezeiv/source/blender/src/drawimasel.c
    branches/soc-2008-unclezeiv/source/blender/src/drawnla.c
    branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
    branches/soc-2008-unclezeiv/source/blender/src/drawseq.c
    branches/soc-2008-unclezeiv/source/blender/src/drawview.c
    branches/soc-2008-unclezeiv/source/blender/src/edit.c
    branches/soc-2008-unclezeiv/source/blender/src/editaction.c
    branches/soc-2008-unclezeiv/source/blender/src/editarmature.c
    branches/soc-2008-unclezeiv/source/blender/src/editdeform.c
    branches/soc-2008-unclezeiv/source/blender/src/editface.c
    branches/soc-2008-unclezeiv/source/blender/src/editipo.c
    branches/soc-2008-unclezeiv/source/blender/src/editmesh_lib.c
    branches/soc-2008-unclezeiv/source/blender/src/editmesh_mods.c
    branches/soc-2008-unclezeiv/source/blender/src/editmesh_tools.c
    branches/soc-2008-unclezeiv/source/blender/src/editnla.c
    branches/soc-2008-unclezeiv/source/blender/src/editobject.c
    branches/soc-2008-unclezeiv/source/blender/src/editseq.c
    branches/soc-2008-unclezeiv/source/blender/src/editsima.c
    branches/soc-2008-unclezeiv/source/blender/src/editview.c
    branches/soc-2008-unclezeiv/source/blender/src/filesel.c
    branches/soc-2008-unclezeiv/source/blender/src/header_image.c
    branches/soc-2008-unclezeiv/source/blender/src/header_seq.c
    branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
    branches/soc-2008-unclezeiv/source/blender/src/headerbuttons.c
    branches/soc-2008-unclezeiv/source/blender/src/imasel.c
    branches/soc-2008-unclezeiv/source/blender/src/interface.c
    branches/soc-2008-unclezeiv/source/blender/src/interface_draw.c
    branches/soc-2008-unclezeiv/source/blender/src/interface_icons.c
    branches/soc-2008-unclezeiv/source/blender/src/parametrizer.c
    branches/soc-2008-unclezeiv/source/blender/src/parametrizer.h
    branches/soc-2008-unclezeiv/source/blender/src/parametrizer_intern.h
    branches/soc-2008-unclezeiv/source/blender/src/renderwin.c
    branches/soc-2008-unclezeiv/source/blender/src/sequence.c
    branches/soc-2008-unclezeiv/source/blender/src/space.c
    branches/soc-2008-unclezeiv/source/blender/src/splash.jpg.c
    branches/soc-2008-unclezeiv/source/blender/src/toets.c
    branches/soc-2008-unclezeiv/source/blender/src/transform.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_constraints.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_generics.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_manipulator.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_orientations.c
    branches/soc-2008-unclezeiv/source/blender/src/unwrapper.c
    branches/soc-2008-unclezeiv/source/blender/src/usiblender.c
    branches/soc-2008-unclezeiv/source/blender/src/view.c
    branches/soc-2008-unclezeiv/source/blender/src/writemovie.c
    branches/soc-2008-unclezeiv/source/creator/creator.c
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/GameLogic.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_GameObject.py
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/soc-2008-unclezeiv/source/nan_definitions.mk

Added Paths:
-----------
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Particle.py

Removed Paths:
-------------
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/epy_docgen-3.sh

Modified: branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_NDOFManager.cpp	2008-05-13 22:30:59 UTC (rev 14831)
+++ branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_NDOFManager.cpp	2008-05-13 23:57:35 UTC (rev 14832)
@@ -73,7 +73,9 @@
     if (ndofLibraryInit  && ndofDeviceOpen)
     {
     	Pid= ndofLibraryInit();
+#if 0
        	printf("%i client \n", Pid);
+#endif
 		#if defined(_WIN32) || defined(__APPLE__)
 			m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
 		#else

Modified: branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_System.cpp	2008-05-13 22:30:59 UTC (rev 14831)
+++ branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_System.cpp	2008-05-13 23:57:35 UTC (rev 14832)
@@ -283,9 +283,11 @@
 	m_eventManager = new GHOST_EventManager ();
     m_ndofManager = new GHOST_NDOFManager();
 
+#if 0
 	if(m_ndofManager)
 		printf("ndof manager \n");
-
+#endif
+	
 #ifdef GHOST_DEBUG
 	if (m_eventManager) {
 		m_eventManager->addConsumer(&m_eventPrinter);

Modified: branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj	2008-05-13 22:30:59 UTC (rev 14831)
+++ branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj	2008-05-13 23:57:35 UTC (rev 14832)
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				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="WIN32,_LIB,_DEBUG"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				DefaultCharIsUnsigned="TRUE"
@@ -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-unclezeiv/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj	2008-05-13 22:30:59 UTC (rev 14831)
+++ branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj	2008-05-13 23:57:35 UTC (rev 14832)
@@ -127,7 +127,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"
@@ -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"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list