[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44477] branches/ge_harmony: Merged revision(s) 44281-44476 from Trunk
Daniel Stokes
kupomail at gmail.com
Mon Feb 27 08:28:36 CET 2012
Revision: 44477
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44477
Author: kupoman
Date: 2012-02-27 07:28:24 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Merged revision(s) 44281-44476 from Trunk
Modified Paths:
--------------
branches/ge_harmony/CMakeLists.txt
branches/ge_harmony/SConstruct
branches/ge_harmony/build_files/buildbot/slave_compile.py
branches/ge_harmony/build_files/buildbot/slave_pack.py
branches/ge_harmony/build_files/cmake/Modules/FindGLEW.cmake
branches/ge_harmony/build_files/scons/config/darwin-config.py
branches/ge_harmony/build_files/scons/config/win32-mingw-config.py
branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
branches/ge_harmony/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
branches/ge_harmony/extern/recastnavigation/Recast/Source/RecastLayers.cpp
branches/ge_harmony/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/ge_harmony/intern/boolop/intern/BOP_BSPNode.cpp
branches/ge_harmony/intern/boolop/intern/BOP_Face2Face.cpp
branches/ge_harmony/intern/boolop/intern/BOP_Merge2.h
branches/ge_harmony/intern/boolop/intern/BOP_Mesh.cpp
branches/ge_harmony/intern/boolop/intern/BOP_Mesh.h
branches/ge_harmony/intern/bsp/intern/BSP_MeshPrimitives.h
branches/ge_harmony/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
branches/ge_harmony/intern/cycles/device/device_multi.cpp
branches/ge_harmony/intern/cycles/device/device_network.h
branches/ge_harmony/intern/cycles/device/device_opencl.cpp
branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
branches/ge_harmony/intern/cycles/kernel/kernel_types.h
branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_texture.h
branches/ge_harmony/intern/cycles/kernel/osl/osl_services.h
branches/ge_harmony/intern/cycles/kernel/svm/bsdf_oren_nayar.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_texture.h
branches/ge_harmony/intern/cycles/render/session.cpp
branches/ge_harmony/intern/cycles/render/session.h
branches/ge_harmony/intern/ffmpeg/ffmpeg_compat.h
branches/ge_harmony/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_NDOFManager.h
branches/ge_harmony/intern/ghost/intern/GHOST_WindowManager.cpp
branches/ge_harmony/intern/string/STR_String.h
branches/ge_harmony/intern/string/intern/STR_String.cpp
branches/ge_harmony/release/scripts/modules/bpy_extras/mesh_utils.py
branches/ge_harmony/release/scripts/presets/interface_theme/elsyiun.xml
branches/ge_harmony/release/scripts/presets/keyconfig/maya.py
branches/ge_harmony/release/scripts/startup/bl_operators/wm.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
branches/ge_harmony/release/text/readme.html
branches/ge_harmony/source/blender/blenkernel/BKE_mball.h
branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
branches/ge_harmony/source/blender/blenkernel/BKE_multires.h
branches/ge_harmony/source/blender/blenkernel/BKE_node.h
branches/ge_harmony/source/blender/blenkernel/BKE_subsurf.h
branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
branches/ge_harmony/source/blender/blenkernel/BKE_writeffmpeg.h
branches/ge_harmony/source/blender/blenkernel/CMakeLists.txt
branches/ge_harmony/source/blender/blenkernel/intern/CCGSubSurf.c
branches/ge_harmony/source/blender/blenkernel/intern/CCGSubSurf.h
branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_harmony/source/blender/blenkernel/intern/action.c
branches/ge_harmony/source/blender/blenkernel/intern/armature.c
branches/ge_harmony/source/blender/blenkernel/intern/boids.c
branches/ge_harmony/source/blender/blenkernel/intern/brush.c
branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/constraint.c
branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
branches/ge_harmony/source/blender/blenkernel/intern/editderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/font.c
branches/ge_harmony/source/blender/blenkernel/intern/idprop.c
branches/ge_harmony/source/blender/blenkernel/intern/lattice.c
branches/ge_harmony/source/blender/blenkernel/intern/material.c
branches/ge_harmony/source/blender/blenkernel/intern/mball.c
branches/ge_harmony/source/blender/blenkernel/intern/mesh.c
branches/ge_harmony/source/blender/blenkernel/intern/mesh_validate.c
branches/ge_harmony/source/blender/blenkernel/intern/movieclip.c
branches/ge_harmony/source/blender/blenkernel/intern/multires.c
branches/ge_harmony/source/blender/blenkernel/intern/node.c
branches/ge_harmony/source/blender/blenkernel/intern/object.c
branches/ge_harmony/source/blender/blenkernel/intern/ocean.c
branches/ge_harmony/source/blender/blenkernel/intern/particle_system.c
branches/ge_harmony/source/blender/blenkernel/intern/scene.c
branches/ge_harmony/source/blender/blenkernel/intern/sequencer.c
branches/ge_harmony/source/blender/blenkernel/intern/softbody.c
branches/ge_harmony/source/blender/blenkernel/intern/sound.c
branches/ge_harmony/source/blender/blenkernel/intern/subsurf_ccg.c
branches/ge_harmony/source/blender/blenkernel/intern/text.c
branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
branches/ge_harmony/source/blender/blenkernel/intern/unit.c
branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_harmony/source/blender/blenlib/BLI_pbvh.h
branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
branches/ge_harmony/source/blender/blenlib/SConscript
branches/ge_harmony/source/blender/blenlib/intern/BLI_args.c
branches/ge_harmony/source/blender/blenlib/intern/BLI_linklist.c
branches/ge_harmony/source/blender/blenlib/intern/math_base_inline.c
branches/ge_harmony/source/blender/blenlib/intern/math_color_inline.c
branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
branches/ge_harmony/source/blender/blenlib/intern/math_geom_inline.c
branches/ge_harmony/source/blender/blenlib/intern/math_vector_inline.c
branches/ge_harmony/source/blender/blenlib/intern/path_util.c
branches/ge_harmony/source/blender/blenlib/intern/pbvh.c
branches/ge_harmony/source/blender/blenloader/intern/readfile.c
branches/ge_harmony/source/blender/blenloader/intern/writefile.c
branches/ge_harmony/source/blender/bmesh/CMakeLists.txt
branches/ge_harmony/source/blender/bmesh/SConscript
branches/ge_harmony/source/blender/bmesh/bmesh.h
branches/ge_harmony/source/blender/bmesh/bmesh_class.h
branches/ge_harmony/source/blender/bmesh/bmesh_error.h
branches/ge_harmony/source/blender/bmesh/bmesh_iterators.h
branches/ge_harmony/source/blender/bmesh/bmesh_marking.h
branches/ge_harmony/source/blender/bmesh/bmesh_operator_api.h
branches/ge_harmony/source/blender/bmesh/bmesh_queries.h
branches/ge_harmony/source/blender/bmesh/bmesh_walkers.h
branches/ge_harmony/source/blender/bmesh/docs/bmesh_design.mwiki
branches/ge_harmony/source/blender/bmesh/intern/bmesh_construct.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_inline.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators_inline.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_mods.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_newcore.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_opdefines.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_private.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_structure.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_structure.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_connect.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_create.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_dissolve.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_dupe.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_edgesplit.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_extrude.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_join_triangles.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_primitive.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_removedoubles.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_triangulate.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.c
branches/ge_harmony/source/blender/bmesh/tools/BME_bevel.c
branches/ge_harmony/source/blender/collada/ArmatureExporter.cpp
branches/ge_harmony/source/blender/collada/GeometryExporter.cpp
branches/ge_harmony/source/blender/editors/armature/reeb.c
branches/ge_harmony/source/blender/editors/include/ED_object.h
branches/ge_harmony/source/blender/editors/include/ED_view3d.h
branches/ge_harmony/source/blender/editors/interface/interface_icons.c
branches/ge_harmony/source/blender/editors/mesh/bmesh_select.c
branches/ge_harmony/source/blender/editors/mesh/bmesh_selecthistory.c
branches/ge_harmony/source/blender/editors/mesh/bmesh_tools.c
branches/ge_harmony/source/blender/editors/mesh/bmesh_utils.c
branches/ge_harmony/source/blender/editors/mesh/editface.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_add.c
branches/ge_harmony/source/blender/editors/mesh/knifetool.c
branches/ge_harmony/source/blender/editors/mesh/loopcut.c
branches/ge_harmony/source/blender/editors/mesh/mesh_data.c
branches/ge_harmony/source/blender/editors/mesh/mesh_intern.h
branches/ge_harmony/source/blender/editors/metaball/mball_edit.c
branches/ge_harmony/source/blender/editors/object/object_add.c
branches/ge_harmony/source/blender/editors/object/object_bake.c
branches/ge_harmony/source/blender/editors/object/object_edit.c
branches/ge_harmony/source/blender/editors/object/object_modifier.c
branches/ge_harmony/source/blender/editors/object/object_relations.c
branches/ge_harmony/source/blender/editors/object/object_transform.c
branches/ge_harmony/source/blender/editors/object/object_vgroup.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
branches/ge_harmony/source/blender/editors/space_clip/clip_ops.c
branches/ge_harmony/source/blender/editors/space_clip/space_clip.c
branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
branches/ge_harmony/source/blender/editors/space_image/image_ops.c
branches/ge_harmony/source/blender/editors/space_node/drawnode.c
branches/ge_harmony/source/blender/editors/space_node/node_draw.c
branches/ge_harmony/source/blender/editors/space_node/node_edit.c
branches/ge_harmony/source/blender/editors/space_node/node_header.c
branches/ge_harmony/source/blender/editors/space_node/node_intern.h
branches/ge_harmony/source/blender/editors/space_node/node_ops.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_edit.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.c
branches/ge_harmony/source/blender/editors/space_view3d/drawanimviz.c
branches/ge_harmony/source/blender/editors/space_view3d/drawarmature.c
branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
branches/ge_harmony/source/blender/editors/space_view3d/drawobject.c
branches/ge_harmony/source/blender/editors/space_view3d/drawvolume.c
branches/ge_harmony/source/blender/editors/space_view3d/space_view3d.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_buttons.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_draw.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_edit.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_fly.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_header.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_select.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_snap.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_toolbar.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
branches/ge_harmony/source/blender/editors/transform/transform.c
branches/ge_harmony/source/blender/editors/transform/transform.h
branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
branches/ge_harmony/source/blender/editors/transform/transform_generics.c
branches/ge_harmony/source/blender/editors/transform/transform_manipulator.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_draw.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_intern.h
branches/ge_harmony/source/blender/editors/uvedit/uvedit_ops.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/ge_harmony/source/blender/gpu/GPU_buffers.h
branches/ge_harmony/source/blender/gpu/intern/gpu_buffers.c
branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
branches/ge_harmony/source/blender/imbuf/IMB_imbuf.h
branches/ge_harmony/source/blender/imbuf/intern/cineon/logImageLib.c
branches/ge_harmony/source/blender/imbuf/intern/divers.c
branches/ge_harmony/source/blender/imbuf/intern/indexer.c
branches/ge_harmony/source/blender/imbuf/intern/scaling.c
branches/ge_harmony/source/blender/makesdna/DNA_customdata_types.h
branches/ge_harmony/source/blender/makesdna/DNA_modifier_types.h
branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
branches/ge_harmony/source/blender/makesdna/DNA_object_types.h
branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
branches/ge_harmony/source/blender/makesdna/DNA_space_types.h
branches/ge_harmony/source/blender/makesrna/RNA_access.h
branches/ge_harmony/source/blender/makesrna/intern/makesrna.c
branches/ge_harmony/source/blender/makesrna/intern/rna_define.c
branches/ge_harmony/source/blender/makesrna/intern/rna_mesh.c
branches/ge_harmony/source/blender/makesrna/intern/rna_modifier.c
branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree_types.h
branches/ge_harmony/source/blender/makesrna/intern/rna_object_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
branches/ge_harmony/source/blender/modifiers/CMakeLists.txt
branches/ge_harmony/source/blender/modifiers/intern/MOD_array.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_bevel.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_cloth.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_collision.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_edgesplit.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_explode.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_mirror.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_screw.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_solidify.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_uvproject.c
branches/ge_harmony/source/blender/nodes/NOD_composite.h
branches/ge_harmony/source/blender/nodes/composite/node_composite_tree.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/ge_harmony/source/blender/python/CMakeLists.txt
branches/ge_harmony/source/blender/python/SConscript
branches/ge_harmony/source/blender/python/generic/idprop_py_api.c
branches/ge_harmony/source/blender/python/generic/py_capi_utils.c
branches/ge_harmony/source/blender/python/generic/py_capi_utils.h
branches/ge_harmony/source/blender/python/intern/bpy_interface.c
branches/ge_harmony/source/blender/python/intern/bpy_rna.c
branches/ge_harmony/source/blender/python/intern/bpy_rna.h
branches/ge_harmony/source/blender/python/intern/bpy_rna_anim.c
branches/ge_harmony/source/blender/python/intern/gpu.c
branches/ge_harmony/source/blender/python/mathutils/mathutils.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_noise.c
branches/ge_harmony/source/blender/quicktime/apple/qtkit_export.m
branches/ge_harmony/source/blender/quicktime/apple/quicktime_export.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
branches/ge_harmony/source/blenderplayer/CMakeLists.txt
branches/ge_harmony/source/creator/CMakeLists.txt
branches/ge_harmony/source/gameengine/BlenderRoutines/BL_System.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
branches/ge_harmony/source/gameengine/Converter/BL_ActionActuator.cpp
branches/ge_harmony/source/gameengine/Converter/BL_ActionActuator.h
branches/ge_harmony/source/gameengine/Converter/BL_ArmatureActuator.h
branches/ge_harmony/source/gameengine/Converter/BL_ArmatureChannel.h
branches/ge_harmony/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/ge_harmony/source/gameengine/Converter/BL_ArmatureObject.h
branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/ge_harmony/source/gameengine/Converter/BL_DeformableGameObject.h
branches/ge_harmony/source/gameengine/Converter/BL_MeshDeformer.h
branches/ge_harmony/source/gameengine/Converter/BL_ModifierDeformer.h
branches/ge_harmony/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/ge_harmony/source/gameengine/Converter/BL_ShapeDeformer.h
branches/ge_harmony/source/gameengine/Converter/BL_SkinDeformer.h
branches/ge_harmony/source/gameengine/Converter/BlenderWorldInfo.h
branches/ge_harmony/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/ge_harmony/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/ge_harmony/source/gameengine/Converter/KX_ConvertActuators.h
branches/ge_harmony/source/gameengine/Converter/KX_ConvertControllers.h
branches/ge_harmony/source/gameengine/Converter/KX_ConvertProperties.h
branches/ge_harmony/source/gameengine/Converter/KX_ConvertSensors.h
branches/ge_harmony/source/gameengine/Converter/KX_IpoConvert.h
branches/ge_harmony/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/ge_harmony/source/gameengine/Expressions/EXP_C-Api.h
branches/ge_harmony/source/gameengine/Expressions/IdentifierExpr.h
branches/ge_harmony/source/gameengine/Expressions/IntValue.cpp
branches/ge_harmony/source/gameengine/Expressions/KX_HashedPtr.h
branches/ge_harmony/source/gameengine/Expressions/KX_Python.h
branches/ge_harmony/source/gameengine/Expressions/ListValue.cpp
branches/ge_harmony/source/gameengine/Expressions/Operator1Expr.cpp
branches/ge_harmony/source/gameengine/Expressions/Operator2Expr.cpp
branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.h
branches/ge_harmony/source/gameengine/Expressions/Value.h
branches/ge_harmony/source/gameengine/Expressions/VectorValue.cpp
branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_ANDController.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_BasicEventManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_EventManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_IActuator.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_IController.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_IObject.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_IScene.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_ISensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_JoystickManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_KeyboardManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_LogicManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_MouseManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_NANDController.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_NORController.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_ORController.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonController.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomEventManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_TimeEventManager.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_XNORController.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_XORController.h
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_System.h
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_System.h
branches/ge_harmony/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/ge_harmony/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
branches/ge_harmony/source/gameengine/Ketsji/BL_Action.h
branches/ge_harmony/source/gameengine/Ketsji/BL_ActionManager.h
branches/ge_harmony/source/gameengine/Ketsji/BL_BlenderShader.h
branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/ge_harmony/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/ge_harmony/source/gameengine/Ketsji/KX_Camera.h
branches/ge_harmony/source/gameengine/Ketsji/KX_CameraActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_CameraIpoSGController.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/ge_harmony/source/gameengine/Ketsji/KX_EmptyObject.h
branches/ge_harmony/source/gameengine/Ketsji/KX_FontObject.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_FontObject.h
branches/ge_harmony/source/gameengine/Ketsji/KX_GameActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.h
branches/ge_harmony/source/gameengine/Ketsji/KX_IInterpolator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_IPOTransform.h
branches/ge_harmony/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/ge_harmony/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/ge_harmony/source/gameengine/Ketsji/KX_IScalarInterpolator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ISystem.h
branches/ge_harmony/source/gameengine/Ketsji/KX_IpoActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/ge_harmony/source/gameengine/Ketsji/KX_Light.h
branches/ge_harmony/source/gameengine/Ketsji/KX_LightIpoSGController.h
branches/ge_harmony/source/gameengine/Ketsji/KX_MeshProxy.h
branches/ge_harmony/source/gameengine/Ketsji/KX_MotionState.h
branches/ge_harmony/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/ge_harmony/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/ge_harmony/source/gameengine/Ketsji/KX_NearSensor.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ObstacleSimulation.h
branches/ge_harmony/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_OrientationInterpolator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ParentActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PositionInterpolator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_PositionInterpolator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PyConstraintBinding.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInit.h
branches/ge_harmony/source/gameengine/Ketsji/KX_RadarSensor.h
branches/ge_harmony/source/gameengine/Ketsji/KX_RayEventManager.h
branches/ge_harmony/source/gameengine/Ketsji/KX_RaySensor.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_ScalarInterpolator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_ScalingInterpolator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SceneActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_SoundActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_StateActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/ge_harmony/source/gameengine/Ketsji/KX_TimeLogger.h
branches/ge_harmony/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/ge_harmony/source/gameengine/Ketsji/KX_TouchSensor.h
branches/ge_harmony/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/ge_harmony/source/gameengine/Ketsji/KX_VertexProxy.h
branches/ge_harmony/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_WorldInfo.h
branches/ge_harmony/source/gameengine/Ketsji/KX_WorldIpoController.h
branches/ge_harmony/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
branches/ge_harmony/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/ge_harmony/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/ge_harmony/source/gameengine/Network/NG_NetworkMessage.h
branches/ge_harmony/source/gameengine/Network/NG_NetworkObject.h
branches/ge_harmony/source/gameengine/Network/NG_NetworkScene.cpp
branches/ge_harmony/source/gameengine/Network/NG_NetworkScene.h
branches/ge_harmony/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/ge_harmony/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/ge_harmony/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/ge_harmony/source/gameengine/Physics/common/PHY_IController.h
branches/ge_harmony/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/ge_harmony/source/gameengine/Physics/common/PHY_IMotionState.h
branches/ge_harmony/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/ge_harmony/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/ge_harmony/source/gameengine/Physics/common/PHY_IVehicle.h
branches/ge_harmony/source/gameengine/Physics/common/PHY_Pro.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_CameraData.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_Deformer.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_LightObject.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_ObjectColor.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_Polygon.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_Rect.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexMatrix.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexVert.h
branches/ge_harmony/source/gameengine/SceneGraph/SG_Controller.h
branches/ge_harmony/source/gameengine/SceneGraph/SG_DList.h
branches/ge_harmony/source/gameengine/SceneGraph/SG_IObject.h
branches/ge_harmony/source/gameengine/SceneGraph/SG_Node.h
branches/ge_harmony/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/ge_harmony/source/gameengine/SceneGraph/SG_QList.h
branches/ge_harmony/source/gameengine/SceneGraph/SG_Spatial.h
Added Paths:
-----------
branches/ge_harmony/source/blender/blenlib/BLI_bitmap.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api_inline.c
branches/ge_harmony/source/blender/python/bmesh/
Removed Paths:
-------------
branches/ge_harmony/source/blender/blenkernel/intern/bmesh_private.h
branches/ge_harmony/source/blender/modifiers/intern/MOD_ngoninterp.c
Property Changed:
----------------
branches/ge_harmony/
branches/ge_harmony/source/blender/editors/space_outliner/
Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:42243-44281
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:42243-44476
Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt 2012-02-27 02:46:25 UTC (rev 44476)
+++ branches/ge_harmony/CMakeLists.txt 2012-02-27 07:28:24 UTC (rev 44477)
@@ -254,7 +254,6 @@
"Choose the minimum OSX version required: 10.4 or 10.5"
FORCE)
endif()
- MESSAGE(STATUS ${CMAKE_GENERATOR})
if(${CMAKE_GENERATOR} MATCHES "Xcode")
if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4)
# Xcode 4 defaults to the Apple LLVM Compiler.
@@ -1034,8 +1033,8 @@
if(WITH_BOOST)
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
- set(BOOST_POSTFIX "mgw45-mt-s-1_47")
- set(BOOST_DEBUG_POSTFIX "mgw45-mt-sd-1_47")
+ set(BOOST_POSTFIX "mgw46-mt-s-1_47")
+ set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_47")
set(BOOST_LIBRARIES
optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
boost_regex-${BOOST_POSTFIX} boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
@@ -1499,7 +1498,7 @@
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(WITH_IK_ITASC)
- message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC and WITH_MOD_FLUID, these features will be missing.")
+ message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC, this feature will be missing.")
set(WITH_IK_ITASC OFF)
endif()
endif()
Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct 2012-02-27 02:46:25 UTC (rev 44476)
+++ branches/ge_harmony/SConstruct 2012-02-27 07:28:24 UTC (rev 44477)
@@ -274,7 +274,7 @@
# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
if env['OURPLATFORM']=='darwin':
- print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][:9] + " --"
+ print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
print "Available " + env['MACOSX_SDK_CHECK']
if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
print B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + " using MacOSX10.6.sdk"
Modified: branches/ge_harmony/build_files/buildbot/slave_compile.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/slave_compile.py 2012-02-27 02:46:25 UTC (rev 44476)
+++ branches/ge_harmony/build_files/buildbot/slave_compile.py 2012-02-27 07:28:24 UTC (rev 44477)
@@ -55,7 +55,7 @@
# scons
os.chdir(blender_dir)
scons_cmd = ['python', 'scons/scons.py']
- scons_options = []
+ scons_options = ['BF_FANCY=False']
if builder.find('linux') != -1:
import shutil
@@ -65,7 +65,7 @@
build_dir = os.path.join('..', 'build', builder)
install_dir = os.path.join('..', 'install', builder)
- common_options = ['BF_INSTALLDIR=' + install_dir]
+ common_options = ['BF_INSTALLDIR=' + install_dir] + scons_options
# Clean install directory so we'll be sure there's no
if os.path.isdir(install_dir):
Modified: branches/ge_harmony/build_files/buildbot/slave_pack.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/slave_pack.py 2012-02-27 02:46:25 UTC (rev 44476)
+++ branches/ge_harmony/build_files/buildbot/slave_pack.py 2012-02-27 07:28:24 UTC (rev 44477)
@@ -41,7 +41,7 @@
# scons does own packaging
if builder.find('scons') != -1:
os.chdir('../blender')
- scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave']
+ scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False']
if builder.find('linux') != -1:
buildbot_dir = os.path.dirname(os.path.realpath(__file__))
Modified: branches/ge_harmony/build_files/cmake/Modules/FindGLEW.cmake
===================================================================
--- branches/ge_harmony/build_files/cmake/Modules/FindGLEW.cmake 2012-02-27 02:46:25 UTC (rev 44476)
+++ branches/ge_harmony/build_files/cmake/Modules/FindGLEW.cmake 2012-02-27 07:28:24 UTC (rev 44477)
@@ -18,7 +18,7 @@
PATHS
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
+ ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library (64-bit)"
)
ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
@@ -27,7 +27,7 @@
PATHS
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
+ ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library"
)
ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
Modified: branches/ge_harmony/build_files/scons/config/darwin-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/darwin-config.py 2012-02-27 02:46:25 UTC (rev 44476)
+++ branches/ge_harmony/build_files/scons/config/darwin-config.py 2012-02-27 07:28:24 UTC (rev 44477)
@@ -34,7 +34,7 @@
MAC_CUR_VER='10.7'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
-XCODE_CUR_VER=cmd_xcode
+XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
cmd = 'xcodebuild -showsdks'
cmd_sdk=commands.getoutput(cmd)
MACOSX_SDK_CHECK=cmd_sdk
@@ -102,7 +102,7 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg_0.10'
+BF_FFMPEG = LIBDIR + '/ffmpeg'
BF_FFMPEG_INC = "${BF_FFMPEG}/include"
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
Modified: branches/ge_harmony/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/win32-mingw-config.py 2012-02-27 02:46:25 UTC (rev 44476)
+++ branches/ge_harmony/build_files/scons/config/win32-mingw-config.py 2012-02-27 07:28:24 UTC (rev 44477)
@@ -163,7 +163,7 @@
WITH_BF_BOOST = True
BF_BOOST = LIBDIR + '/boost'
BF_BOOST_INC = BF_BOOST + '/include'
-BF_BOOST_LIB = 'boost_date_time-mgw45-mt-s-1_47 boost_filesystem-mgw45-mt-s-1_47 boost_regex-mgw45-mt-s-1_47 boost_system-mgw45-mt-s-1_47 boost_thread-mgw45-mt-s-1_47'
+BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_47 boost_filesystem-mgw46-mt-s-1_47 boost_regex-mgw46-mt-s-1_47 boost_system-mgw46-mt-s-1_47 boost_thread-mgw46-mt-s-1_47'
BF_BOOST_LIBPATH = BF_BOOST + '/lib/gcc'
#Ray trace optimization
Modified: branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/ge_harmony/doc/python_api/sphinx_doc_gen.py 2012-02-27 02:46:25 UTC (rev 44476)
+++ branches/ge_harmony/doc/python_api/sphinx_doc_gen.py 2012-02-27 07:28:24 UTC (rev 44477)
@@ -66,12 +66,12 @@
FILTER_BPY_OPS = None
else:
- EXCLUDE_INFO_DOCS = False
+ EXCLUDE_INFO_DOCS = True
# for testing so doc-builds dont take so long.
EXCLUDE_MODULES = (
"bpy.context",
- #"bpy.app",
- #"bpy.app.handlers",
+ "bpy.app",
+ "bpy.app.handlers",
"bpy.path",
"bpy.data",
"bpy.props",
@@ -88,6 +88,9 @@
"mathutils",
"mathutils.geometry",
"mathutils.noise",
+ #"bmesh",
+ #"bmesh.types",
+ #"bmesh.utils",
)
FILTER_BPY_TYPES = ("bpy_struct", "Operator", "ID") # allow
@@ -1189,12 +1192,14 @@
fw(".. toctree::\n")
fw(" :maxdepth: 1\n\n")
+ # mathutils
if "mathutils" not in EXCLUDE_MODULES:
fw(" mathutils.rst\n\n")
if "mathutils.geometry" not in EXCLUDE_MODULES:
fw(" mathutils.geometry.rst\n\n")
if "mathutils.noise" not in EXCLUDE_MODULES:
fw(" mathutils.noise.rst\n\n")
+ # misc
if "bgl" not in EXCLUDE_MODULES:
fw(" bgl.rst\n\n")
if "blf" not in EXCLUDE_MODULES:
@@ -1205,6 +1210,13 @@
fw(" aud.rst\n\n")
if "bpy_extras" not in EXCLUDE_MODULES:
fw(" bpy_extras.rst\n\n")
+ # bmesh
+ if "bmesh" not in EXCLUDE_MODULES:
+ fw(" bmesh.rst\n\n")
+ if "bmesh.types" not in EXCLUDE_MODULES:
+ fw(" bmesh.types.rst\n\n")
+ if "bmesh.utils" not in EXCLUDE_MODULES:
+ fw(" bmesh.utils.rst\n\n")
# game engine
if "bge" not in EXCLUDE_MODULES:
@@ -1338,6 +1350,18 @@
import mathutils.noise as module
pymodule2sphinx(BASEPATH, "mathutils.noise", module, "Noise Utilities")
+ if "bmesh" not in EXCLUDE_MODULES:
+ import bmesh as module
+ pymodule2sphinx(BASEPATH, "bmesh", module, "BMesh Module")
+
+ if "bmesh.types" not in EXCLUDE_MODULES:
+ import bmesh.types as module
+ pymodule2sphinx(BASEPATH, "bmesh.types", module, "BMesh Types")
+
+ if "bmesh.utils" not in EXCLUDE_MODULES:
+ import bmesh.utils as module
+ pymodule2sphinx(BASEPATH, "bmesh.utils", module, "BMesh Utilities")
+
if "blf" not in EXCLUDE_MODULES:
import blf as module
pymodule2sphinx(BASEPATH, "blf", module, "Font Drawing")
Modified: branches/ge_harmony/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list