[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29262] branches/soc-2010-jwilkins: Merged with trunk: 29203-29259

Jason Wilkins Jason.A.Wilkins at gmail.com
Sun Jun 6 08:30:13 CEST 2010


Revision: 29262
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29262
Author:   jwilkins
Date:     2010-06-06 08:30:12 +0200 (Sun, 06 Jun 2010)

Log Message:
-----------
Merged with trunk: 29203-29259
Had to modify source/blender/editors/render/CMakeLists.txt to make build work in MSVC

Modified Paths:
--------------
    branches/soc-2010-jwilkins/CMakeLists.txt
    branches/soc-2010-jwilkins/SConstruct
    branches/soc-2010-jwilkins/config/aix4-config.py
    branches/soc-2010-jwilkins/config/linuxcross-config.py
    branches/soc-2010-jwilkins/config/win32-mingw-config.py
    branches/soc-2010-jwilkins/config/win32-vc-config.py
    branches/soc-2010-jwilkins/config/win64-vc-config.py
    branches/soc-2010-jwilkins/intern/string/STR_String.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/text.c
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_fileops.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/fileops.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-jwilkins/source/blender/collada/DocumentExporter.cpp
    branches/soc-2010-jwilkins/source/blender/editors/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_view3d.h
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/screen/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/screen/area.c
    branches/soc-2010-jwilkins/source/blender/editors/sound/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_api/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_console/space_console.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/script_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/space_script.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-jwilkins/source/blender/makesrna/RNA_types.h
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2010-jwilkins/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-jwilkins/source/creator/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BlenderWorldInfo.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/KX_SoftBodyDeformer.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/BoolValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/ConstExpr.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/EmptyValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/ErrorValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/Expression.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/FloatValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/IdentifierExpr.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/IfExpr.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/InputParser.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/IntValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/KX_HashedPtr.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/Operator1Expr.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/Operator2Expr.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/StringValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/Value.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/VectorValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/VoidValue.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_BasicEventManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_EventManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IScene.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_RandomEventManager.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_TimeEventManager.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/BL_Texture.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_CameraIpoSGController.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Dome.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_EmptyObject.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_IInterpolator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_IScalarInterpolator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ISystem.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_LightIpoSGController.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_MaterialIpoController.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_MotionState.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_OrientationInterpolator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PositionInterpolator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_RayCast.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_RayEventManager.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ScalarInterpolator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ScalingInterpolator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_TimeLogger.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_TouchEventManager.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_WorldInfo.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/soc-2010-jwilkins/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
    branches/soc-2010-jwilkins/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2010-jwilkins/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/soc-2010-jwilkins/source/gameengine/Network/NG_NetworkMessage.h
    branches/soc-2010-jwilkins/source/gameengine/Network/NG_NetworkObject.h
    branches/soc-2010-jwilkins/source/gameengine/Network/NG_NetworkScene.h
    branches/soc-2010-jwilkins/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/PHY_IController.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/PHY_IVehicle.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_Rect.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_BBox.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_Controller.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_Node.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_QList.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_Spatial.h
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_Tree.h
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2010-jwilkins/tools/Blender.py

Added Paths:
-----------
    branches/soc-2010-jwilkins/source/blender/editors/animation/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/armature/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/curve/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/interface/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/metaball/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/object/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/physics/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/render/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/sound/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_action/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_api/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_console/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_sound/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_time/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/transform/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/util/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/CMakeLists.txt

Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/CMakeLists.txt	2010-06-06 06:30:12 UTC (rev 29262)
@@ -422,7 +422,7 @@
 			SET(OPENCOLLADA ${LIBDIR}/opencollada)
 			SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
 			SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-			SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa)
+			SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
 			#pcre is bundled with openCollada
 			#SET(PCRE ${LIBDIR}/pcre)
 			#SET(PCRE_LIBPATH ${PCRE}/lib)

Modified: branches/soc-2010-jwilkins/SConstruct
===================================================================
--- branches/soc-2010-jwilkins/SConstruct	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/SConstruct	2010-06-06 06:30:12 UTC (rev 29262)
@@ -201,6 +201,7 @@
 
 SetOption('num_jobs', int(env['BF_NUMJOBS']))
 print B.bc.OKGREEN + "Build with parallel jobs%s: %s" % (B.bc.ENDC, GetOption('num_jobs'))
+print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC, env['BF_DEBUG'])
 
 # BLENDERPATH is a unix only option to enable typical style paths this is
 # spesifically a data-dir, which is used a lot but cant replace BF_INSTALLDIR

Modified: branches/soc-2010-jwilkins/config/aix4-config.py
===================================================================
--- branches/soc-2010-jwilkins/config/aix4-config.py	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/config/aix4-config.py	2010-06-06 06:30:12 UTC (rev 29262)
@@ -83,22 +83,11 @@
 
 WITH_BF_GAMEENGINE='false'
 
-WITH_BF_ODE = 'false'
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = 'true'
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
-WITH_BF_YAFRAY = 'true'
-
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2010-jwilkins/config/linuxcross-config.py
===================================================================
--- branches/soc-2010-jwilkins/config/linuxcross-config.py	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/config/linuxcross-config.py	2010-06-06 06:30:12 UTC (rev 29262)
@@ -65,7 +65,7 @@
 WITH_BF_JPEG = True
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIB = 'libjpeg'
 BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
 WITH_BF_PNG = True
@@ -83,7 +83,7 @@
 WITH_BF_ZLIB = True
 BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
-#BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIB = 'libz'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = True
@@ -151,9 +151,7 @@
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
 BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
-             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
-             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a']
 
 WITH_BF_OPENMP = True
 BF_OPENMP = LIBDIR + '/gcc/gomp'

Modified: branches/soc-2010-jwilkins/config/win32-mingw-config.py
===================================================================
--- branches/soc-2010-jwilkins/config/win32-mingw-config.py	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/config/win32-mingw-config.py	2010-06-06 06:30:12 UTC (rev 29262)
@@ -64,7 +64,7 @@
 WITH_BF_JPEG = True
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIB = 'liblibjpeg'
 BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
 WITH_BF_PNG = True
@@ -82,6 +82,7 @@
 WITH_BF_ZLIB = True
 BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'libz'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = False

Modified: branches/soc-2010-jwilkins/config/win32-vc-config.py
===================================================================
--- branches/soc-2010-jwilkins/config/win32-vc-config.py	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/config/win32-vc-config.py	2010-06-06 06:30:12 UTC (rev 29262)
@@ -139,14 +139,14 @@
 WITH_BF_REDCODE = False  
 BF_REDCODE_INC = '#extern'
 
-WITH_BF_COLLADA = False
+WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
 BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 #Ray trace optimization

Modified: branches/soc-2010-jwilkins/config/win64-vc-config.py
===================================================================
--- branches/soc-2010-jwilkins/config/win64-vc-config.py	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/config/win64-vc-config.py	2010-06-06 06:30:12 UTC (rev 29262)
@@ -152,14 +152,14 @@
 WITH_BF_REDCODE = False  
 BF_REDCODE_INC = '#extern'
 
-WITH_BF_COLLADA = False
+WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
 BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 #Ray trace optimization

Modified: branches/soc-2010-jwilkins/intern/string/STR_String.h
===================================================================
--- branches/soc-2010-jwilkins/intern/string/STR_String.h	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/intern/string/STR_String.h	2010-06-06 06:30:12 UTC (rev 29262)
@@ -202,8 +202,8 @@
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
+	void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 

Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c	2010-06-06 06:30:12 UTC (rev 29262)
@@ -440,10 +440,8 @@
 {
 	/* on save, type is changed to FILE in editsima.c */
 	Image *ima;
-	char filename[sizeof(ibuf->name)];
 
-	BLI_split_dirfile(ibuf->name, NULL, filename);
-	ima= image_alloc(filename, IMA_SRC_FILE, IMA_TYPE_IMAGE);
+	ima= image_alloc(BLI_path_basename(ibuf->name), IMA_SRC_FILE, IMA_TYPE_IMAGE);
 
 	if (ima) {
 		BLI_strncpy(ima->name, ibuf->name, FILE_MAX);

Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c	2010-06-06 06:30:12 UTC (rev 29262)
@@ -310,7 +310,7 @@
 	int a;
 
 	sce= alloc_libblock(&G.main->scene, ID_SCE, name);
-	sce->lay= 1;
+	sce->lay= sce->layact= 1;
 	
 	sce->r.mode= R_GAMMA|R_OSA|R_SHADOW|R_SSS|R_ENVMAP|R_RAYTRACE;
 	sce->r.cfra= 1;

Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/text.c	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/text.c	2010-06-06 06:30:12 UTC (rev 29262)
@@ -232,7 +232,6 @@
 	int i, llen, len, res;
 	unsigned char *buffer;
 	TextLine *tmp;
-	char sfile[FILE_MAXFILE];
 	char str[FILE_MAXDIR+FILE_MAXFILE];
 	struct stat st;
 
@@ -240,7 +239,6 @@
 	
 	BLI_strncpy(str, text->name, FILE_MAXDIR+FILE_MAXFILE);
 	BLI_path_abs(str, G.sce);
-	BLI_split_dirfile(str, NULL, sfile);
 	
 	fp= fopen(str, "r");
 	if(fp==NULL) return 0;
@@ -331,19 +329,17 @@
 	unsigned char *buffer;
 	TextLine *tmp;
 	Text *ta;
-	char sfile[FILE_MAXFILE];
 	char str[FILE_MAXDIR+FILE_MAXFILE];
 	struct stat st;
 
 	BLI_strncpy(str, file, FILE_MAXDIR+FILE_MAXFILE);
 	if (relpath) /* can be NULL (bg mode) */
 		BLI_path_abs(str, relpath);
-	BLI_split_dirfile(str, NULL, sfile);
 	
 	fp= fopen(str, "r");
 	if(fp==NULL) return NULL;
 	
-	ta= alloc_libblock(&G.main->text, ID_TXT, sfile);
+	ta= alloc_libblock(&G.main->text, ID_TXT, BLI_path_basename(str));
 	ta->id.us= 1;
 
 	ta->lines.first= ta->lines.last= NULL;

Modified: branches/soc-2010-jwilkins/source/blender/blenlib/BLI_fileops.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenlib/BLI_fileops.h	2010-06-06 06:10:54 UTC (rev 29261)
+++ branches/soc-2010-jwilkins/source/blender/blenlib/BLI_fileops.h	2010-06-06 06:30:12 UTC (rev 29262)
@@ -54,7 +54,6 @@
 int	  BLI_add_slash(char *string);
 void  BLI_del_slash(char *string);
 char *first_slash(char *string);
-const char *BLI_short_filename(const char *string);
 
 /* only for the sane unix world: direct calls to system functions :( */
 #ifndef WIN32


@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list