[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13663] branches/soc-2007-red_fox: Merge 13521:13661 from /trunk/blender
Levi Schooley
redfox at hhofministries.org
Wed Feb 13 04:44:52 CET 2008
Revision: 13663
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13663
Author: red_fox
Date: 2008-02-13 04:44:44 +0100 (Wed, 13 Feb 2008)
Log Message:
-----------
Merge 13521:13661 from /trunk/blender
Syncing with /trunk/blender. Preparing for a clean patch.
Levi
Modified Paths:
--------------
branches/soc-2007-red_fox/SConstruct
branches/soc-2007-red_fox/config/win32-mingw-config.py
branches/soc-2007-red_fox/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
branches/soc-2007-red_fox/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/soc-2007-red_fox/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/soc-2007-red_fox/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2007-red_fox/intern/iksolver/intern/TNT/svd.h
branches/soc-2007-red_fox/intern/opennl/SConscript
branches/soc-2007-red_fox/intern/string/STR_String.h
branches/soc-2007-red_fox/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2007-red_fox/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/soc-2007-red_fox/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/soc-2007-red_fox/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/soc-2007-red_fox/release/scripts/import_dxf.py
branches/soc-2007-red_fox/source/blender/avi/intern/avi.c
branches/soc-2007-red_fox/source/blender/avi/intern/endian.c
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_bad_level_calls.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_cloth.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_collision.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_constraint.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_group.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_node.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2007-red_fox/source/blender/blenkernel/CMakeLists.txt
branches/soc-2007-red_fox/source/blender/blenkernel/SConscript
branches/soc-2007-red_fox/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/anim.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/armature.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/blender.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/cloth.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/collision.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/group.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/idprop.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/implicit.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/kdop.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/modifier.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/node.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/object.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/particle.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/particle_system.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/pointcache.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/sca.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/softbody.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2007-red_fox/source/blender/blenlib/intern/psfont.c
branches/soc-2007-red_fox/source/blender/blenloader/intern/readfile.c
branches/soc-2007-red_fox/source/blender/blenloader/intern/writefile.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/filter.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2007-red_fox/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/scaling.c
branches/soc-2007-red_fox/source/blender/include/BDR_editobject.h
branches/soc-2007-red_fox/source/blender/include/BIF_meshtools.h
branches/soc-2007-red_fox/source/blender/include/BIF_poseobject.h
branches/soc-2007-red_fox/source/blender/include/BSE_sequence.h
branches/soc-2007-red_fox/source/blender/include/blendef.h
branches/soc-2007-red_fox/source/blender/include/butspace.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_armature_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_node_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_scriptlink_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2007-red_fox/source/blender/makesdna/intern/SConscript
branches/soc-2007-red_fox/source/blender/nodes/CMakeLists.txt
branches/soc-2007-red_fox/source/blender/nodes/SConscript
branches/soc-2007-red_fox/source/blender/nodes/SHD_node.h
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2007-red_fox/source/blender/nodes/intern/Makefile
branches/soc-2007-red_fox/source/blender/nodes/intern/SHD_nodes/Makefile
branches/soc-2007-red_fox/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/soc-2007-red_fox/source/blender/python/BPY_menus.c
branches/soc-2007-red_fox/source/blender/python/SConscript
branches/soc-2007-red_fox/source/blender/python/api2_2x/BGL.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Blender.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Lamp.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Mesh.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Node.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Node.h
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Font.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Lamp.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Mesh.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Render.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/epy_docgen-3.sh
branches/soc-2007-red_fox/source/blender/python/api2_2x/gen_utils.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/sceneRender.c
branches/soc-2007-red_fox/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2007-red_fox/source/blender/render/intern/include/pixelblending.h
branches/soc-2007-red_fox/source/blender/render/intern/include/render_types.h
branches/soc-2007-red_fox/source/blender/render/intern/source/convertblender.c
branches/soc-2007-red_fox/source/blender/render/intern/source/envmap.c
branches/soc-2007-red_fox/source/blender/render/intern/source/initrender.c
branches/soc-2007-red_fox/source/blender/render/intern/source/occlusion.c
branches/soc-2007-red_fox/source/blender/render/intern/source/pipeline.c
branches/soc-2007-red_fox/source/blender/render/intern/source/pixelblending.c
branches/soc-2007-red_fox/source/blender/render/intern/source/rendercore.c
branches/soc-2007-red_fox/source/blender/render/intern/source/renderdatabase.c
branches/soc-2007-red_fox/source/blender/render/intern/source/shadeinput.c
branches/soc-2007-red_fox/source/blender/render/intern/source/shadeoutput.c
branches/soc-2007-red_fox/source/blender/render/intern/source/sss.c
branches/soc-2007-red_fox/source/blender/render/intern/source/zbuf.c
branches/soc-2007-red_fox/source/blender/src/buttons_editing.c
branches/soc-2007-red_fox/source/blender/src/buttons_logic.c
branches/soc-2007-red_fox/source/blender/src/buttons_object.c
branches/soc-2007-red_fox/source/blender/src/buttons_scene.c
branches/soc-2007-red_fox/source/blender/src/buttons_script.c
branches/soc-2007-red_fox/source/blender/src/buttons_shading.c
branches/soc-2007-red_fox/source/blender/src/drawaction.c
branches/soc-2007-red_fox/source/blender/src/drawarmature.c
branches/soc-2007-red_fox/source/blender/src/drawnode.c
branches/soc-2007-red_fox/source/blender/src/drawobject.c
branches/soc-2007-red_fox/source/blender/src/drawtext.c
branches/soc-2007-red_fox/source/blender/src/editaction.c
branches/soc-2007-red_fox/source/blender/src/editconstraint.c
branches/soc-2007-red_fox/source/blender/src/editgroup.c
branches/soc-2007-red_fox/source/blender/src/editmesh.c
branches/soc-2007-red_fox/source/blender/src/editmesh_loop.c
branches/soc-2007-red_fox/source/blender/src/editnla.c
branches/soc-2007-red_fox/source/blender/src/editnode.c
branches/soc-2007-red_fox/source/blender/src/editobject.c
branches/soc-2007-red_fox/source/blender/src/editseq.c
branches/soc-2007-red_fox/source/blender/src/editsound.c
branches/soc-2007-red_fox/source/blender/src/edittime.c
branches/soc-2007-red_fox/source/blender/src/filelist.c
branches/soc-2007-red_fox/source/blender/src/ghostwinlay.c
branches/soc-2007-red_fox/source/blender/src/header_action.c
branches/soc-2007-red_fox/source/blender/src/header_image.c
branches/soc-2007-red_fox/source/blender/src/header_info.c
branches/soc-2007-red_fox/source/blender/src/header_node.c
branches/soc-2007-red_fox/source/blender/src/header_view3d.c
branches/soc-2007-red_fox/source/blender/src/interface_draw.c
branches/soc-2007-red_fox/source/blender/src/meshtools.c
branches/soc-2007-red_fox/source/blender/src/poseobject.c
branches/soc-2007-red_fox/source/blender/src/previewrender.c
branches/soc-2007-red_fox/source/blender/src/renderwin.c
branches/soc-2007-red_fox/source/blender/src/sculptmode.c
branches/soc-2007-red_fox/source/blender/src/seqeffects.c
branches/soc-2007-red_fox/source/blender/src/seqscopes.c
branches/soc-2007-red_fox/source/blender/src/sequence.c
branches/soc-2007-red_fox/source/blender/src/space.c
branches/soc-2007-red_fox/source/blender/src/toets.c
branches/soc-2007-red_fox/source/blender/src/toolbox.c
branches/soc-2007-red_fox/source/blender/src/transform.c
branches/soc-2007-red_fox/source/blender/src/transform_conversions.c
branches/soc-2007-red_fox/source/blender/src/transform_snap.c
branches/soc-2007-red_fox/source/blender/src/vpaint.c
branches/soc-2007-red_fox/source/blender/yafray/intern/export_File.cpp
branches/soc-2007-red_fox/source/blender/yafray/intern/export_Plugin.cpp
branches/soc-2007-red_fox/source/blender/yafray/intern/yafray_Render.cpp
branches/soc-2007-red_fox/source/creator/creator.c
branches/soc-2007-red_fox/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2007-red_fox/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2007-red_fox/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2007-red_fox/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2007-red_fox/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2007-red_fox/source/gameengine/GameLogic/Makefile
branches/soc-2007-red_fox/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2007-red_fox/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2007-red_fox/source/gameengine/GameLogic/SConscript
branches/soc-2007-red_fox/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
branches/soc-2007-red_fox/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2007-red_fox/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2007-red_fox/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2007-red_fox/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2007-red_fox/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2007-red_fox/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2007-red_fox/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
Added Paths:
-----------
branches/soc-2007-red_fox/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2007-red_fox/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
Removed Paths:
-------------
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
Modified: branches/soc-2007-red_fox/SConstruct
===================================================================
--- branches/soc-2007-red_fox/SConstruct 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/SConstruct 2008-02-13 03:44:44 UTC (rev 13663)
@@ -181,7 +181,6 @@
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM']=='win32-vc':
- env.Append(LINKFLAGS=['/openmp'])
env['CCFLAGS'].append('/openmp')
env['CPPFLAGS'].append('/openmp')
env['CXXFLAGS'].append('/openmp')
@@ -422,10 +421,10 @@
dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
if env['WITH_BF_ICONV']:
dllsources += ['${LCGDIR}/iconv/lib/iconv.dll']
- if env['WITH_BF_FFMPEG']:
- dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
- '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
- '${LCGDIR}/ffmpeg/lib/avutil-49.dll']
+# if env['WITH_BF_FFMPEG']:
+# dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+# '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
+# '${LCGDIR}/ffmpeg/lib/avutil-49.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls
Modified: branches/soc-2007-red_fox/config/win32-mingw-config.py
===================================================================
--- branches/soc-2007-red_fox/config/win32-mingw-config.py 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/config/win32-mingw-config.py 2008-02-13 03:44:44 UTC (rev 13663)
@@ -156,5 +156,8 @@
BF_DEBUG = 'false'
BF_DEBUG_FLAGS= '-g'
+BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE = 'false'
+
BF_BUILDDIR = '..\\build\\win32-mingw'
BF_INSTALLDIR='..\\install\\win32-mingw'
Modified: branches/soc-2007-red_fox/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
===================================================================
--- branches/soc-2007-red_fox/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp 2008-02-13 03:44:44 UTC (rev 13663)
@@ -202,4 +202,4 @@
const btVector3& btConvexTriangleMeshShape::getLocalScaling() const
{
return m_stridingMesh->getScaling();
-}
\ No newline at end of file
+}
Modified: branches/soc-2007-red_fox/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
===================================================================
--- branches/soc-2007-red_fox/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp 2008-02-13 03:44:44 UTC (rev 13663)
@@ -205,7 +205,6 @@
btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_rbBFrame.getOrigin();
btScalar tau = btScalar(0.3);
- btScalar damping = btScalar(1.);
//linear part
if (!m_angularOnly)
Modified: branches/soc-2007-red_fox/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
===================================================================
--- branches/soc-2007-red_fox/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp 2008-02-13 03:44:44 UTC (rev 13663)
@@ -342,4 +342,4 @@
{
m_constraintRefs.remove(c);
m_checkCollideWith = m_constraintRefs.size() > 0;
-}
\ No newline at end of file
+}
Modified: branches/soc-2007-red_fox/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2007-red_fox/intern/ghost/intern/GHOST_WindowX11.cpp 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/intern/ghost/intern/GHOST_WindowX11.cpp 2008-02-13 03:44:44 UTC (rev 13663)
@@ -42,6 +42,8 @@
#include <strings.h>
#endif
+#include <cstring>
+#include <cstdio>
// For obscure full screen mode stuuf
// lifted verbatim from blut.
Modified: branches/soc-2007-red_fox/intern/iksolver/intern/TNT/svd.h
===================================================================
--- branches/soc-2007-red_fox/intern/iksolver/intern/TNT/svd.h 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/intern/iksolver/intern/TNT/svd.h 2008-02-13 03:44:44 UTC (rev 13663)
@@ -18,11 +18,13 @@
#include "tntmath.h"
+#define SVD_MAX_ITER 200
+
namespace TNT
{
template <class MaTRiX, class VecToR >
-void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work2) {
+void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work2, int maxiter=SVD_MAX_ITER) {
int m = A.num_rows();
int n = A.num_cols();
@@ -216,7 +218,10 @@
int kase=0;
k=0;
- // Here is where a test for too many iterations would go.
+ // Test for maximum iterations to avoid infinite loop
+ if(maxiter == 0)
+ break;
+ maxiter--;
// This section of the program inspects for
// negligible elements in the s and e arrays. On
Modified: branches/soc-2007-red_fox/intern/opennl/SConscript
===================================================================
--- branches/soc-2007-red_fox/intern/opennl/SConscript 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/intern/opennl/SConscript 2008-02-13 03:44:44 UTC (rev 13663)
@@ -6,7 +6,7 @@
incs = 'extern superlu'
if (env['OURPLATFORM'] == 'win32-mingw'):
- env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
+ env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern','player'], priority=[1,80,22] )
else:
- env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype='core', priority=55 )
+ env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','player'], priority=[55,22] )
Modified: branches/soc-2007-red_fox/intern/string/STR_String.h
===================================================================
--- branches/soc-2007-red_fox/intern/string/STR_String.h 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/intern/string/STR_String.h 2008-02-13 03:44:44 UTC (rev 13663)
@@ -47,6 +47,10 @@
#include <vector>
#include <limits.h>
+
+#include <cstring>
+#include <cstdlib>
+
using namespace std;
Modified: branches/soc-2007-red_fox/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- branches/soc-2007-red_fox/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2008-02-13 03:44:44 UTC (rev 13663)
@@ -126,7 +126,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET =1"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
Modified: branches/soc-2007-red_fox/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
===================================================================
--- branches/soc-2007-red_fox/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj 2008-02-13 03:06:09 UTC (rev 13662)
+++ branches/soc-2007-red_fox/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj 2008-02-13 03:44:44 UTC (rev 13663)
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer"
PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -73,7 +73,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer"
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list