[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49568] branches/ge_harmony: Merged revisions 49272-49567 from trunk/blender

Daniel Stokes kupomail at gmail.com
Sun Aug 5 03:50:12 CEST 2012


Revision: 49568
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49568
Author:   kupoman
Date:     2012-08-05 01:50:08 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
Merged revisions 49272-49567 from trunk/blender

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/build_files/buildbot/slave_pack.py
    branches/ge_harmony/build_files/cmake/config/blender_lite.cmake
    branches/ge_harmony/build_files/cmake/macros.cmake
    branches/ge_harmony/build_files/scons/tools/Blender.py
    branches/ge_harmony/build_files/scons/tools/btools.py
    branches/ge_harmony/doc/python_api/examples/bpy.ops.2.py
    branches/ge_harmony/doc/python_api/rst/info_best_practice.rst
    branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
    branches/ge_harmony/extern/CMakeLists.txt
    branches/ge_harmony/extern/SConscript
    branches/ge_harmony/extern/bullet2/readme.txt
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/detect.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/jet.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
    branches/ge_harmony/extern/recastnavigation/Recast/Source/RecastContour.cpp
    branches/ge_harmony/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/ge_harmony/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/ge_harmony/intern/CMakeLists.txt
    branches/ge_harmony/intern/SConscript
    branches/ge_harmony/intern/audaspace/FX/AUD_ButterworthFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_FaderFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_3DMath.h
    branches/ge_harmony/intern/audaspace/intern/AUD_C-API.h
    branches/ge_harmony/intern/bsp/CMakeLists.txt
    branches/ge_harmony/intern/bsp/SConscript
    branches/ge_harmony/intern/bsp/intern/CSG_BooleanOps.cpp
    branches/ge_harmony/intern/cycles/bvh/bvh.cpp
    branches/ge_harmony/intern/cycles/device/device_opencl.cpp
    branches/ge_harmony/intern/cycles/kernel/kernel_montecarlo.h
    branches/ge_harmony/intern/cycles/kernel/kernel_path.h
    branches/ge_harmony/intern/cycles/render/image.cpp
    branches/ge_harmony/intern/cycles/render/light.cpp
    branches/ge_harmony/intern/cycles/render/object.cpp
    branches/ge_harmony/intern/cycles/util/util_cache.cpp
    branches/ge_harmony/intern/cycles/util/util_path.cpp
    branches/ge_harmony/intern/elbeem/intern/mvmcoords.cpp
    branches/ge_harmony/intern/ghost/GHOST_IWindow.h
    branches/ge_harmony/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
    branches/ge_harmony/intern/guardedalloc/MEM_guardedalloc.h
    branches/ge_harmony/intern/guardedalloc/intern/mallocn.c
    branches/ge_harmony/intern/iksolver/extern/IK_solver.h
    branches/ge_harmony/intern/iksolver/intern/IK_QJacobian.cpp
    branches/ge_harmony/intern/iksolver/intern/IK_QJacobianSolver.cpp
    branches/ge_harmony/intern/iksolver/intern/IK_QJacobianSolver.h
    branches/ge_harmony/intern/iksolver/intern/IK_QSegment.cpp
    branches/ge_harmony/intern/iksolver/intern/IK_QSegment.h
    branches/ge_harmony/intern/iksolver/intern/IK_QTask.cpp
    branches/ge_harmony/intern/iksolver/intern/IK_QTask.h
    branches/ge_harmony/intern/iksolver/intern/IK_Solver.cpp
    branches/ge_harmony/intern/iksolver/intern/MT_ExpMap.cpp
    branches/ge_harmony/intern/raskter/raskter.c
    branches/ge_harmony/intern/smoke/intern/WAVELET_NOISE.h
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/check_po.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/clean_po.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/merge_po.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/settings.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_branches.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_mo.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_po.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_pot.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_trunk.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/utils.py
    branches/ge_harmony/release/scripts/modules/bpy/utils.py
    branches/ge_harmony/release/scripts/modules/console_python.py
    branches/ge_harmony/release/scripts/modules/sys_info.py
    branches/ge_harmony/release/scripts/presets/tracking_settings/blurry_footage.py
    branches/ge_harmony/release/scripts/presets/tracking_settings/default.py
    branches/ge_harmony/release/scripts/presets/tracking_settings/fast_motion.py
    branches/ge_harmony/release/scripts/startup/bl_operators/clip.py
    branches/ge_harmony/release/scripts/startup/bl_operators/presets.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_speaker.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_material.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_object.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_scene.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_texture.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_world.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_image.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_node.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_sequencer.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_text.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_time.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/ge_harmony/source/blender/avi/intern/avi.c
    branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
    branches/ge_harmony/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_cloth.h
    branches/ge_harmony/source/blender/blenkernel/BKE_customdata.h
    branches/ge_harmony/source/blender/blenkernel/BKE_font.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mask.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_node.h
    branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
    branches/ge_harmony/source/blender/blenkernel/intern/anim.c
    branches/ge_harmony/source/blender/blenkernel/intern/bmfont.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/colortools.c
    branches/ge_harmony/source/blender/blenkernel/intern/constraint.c
    branches/ge_harmony/source/blender/blenkernel/intern/context.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/displist.c
    branches/ge_harmony/source/blender/blenkernel/intern/font.c
    branches/ge_harmony/source/blender/blenkernel/intern/image.c
    branches/ge_harmony/source/blender/blenkernel/intern/library.c
    branches/ge_harmony/source/blender/blenkernel/intern/mask.c
    branches/ge_harmony/source/blender/blenkernel/intern/mask_rasterize.c
    branches/ge_harmony/source/blender/blenkernel/intern/material.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh.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/ocean.c
    branches/ge_harmony/source/blender/blenkernel/intern/packedFile.c
    branches/ge_harmony/source/blender/blenkernel/intern/sequencer.c
    branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
    branches/ge_harmony/source/blender/blenkernel/intern/writeavi.c
    branches/ge_harmony/source/blender/blenkernel/intern/writeframeserver.c
    branches/ge_harmony/source/blender/blenlib/BLI_memarena.h
    branches/ge_harmony/source/blender/blenlib/intern/BLI_args.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/ge_harmony/source/blender/blenlib/intern/DLRB_tree.c
    branches/ge_harmony/source/blender/blenlib/intern/bpath.c
    branches/ge_harmony/source/blender/blenlib/intern/freetypefont.c
    branches/ge_harmony/source/blender/blenlib/intern/math_base_inline.c
    branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
    branches/ge_harmony/source/blender/blenlib/intern/pbvh.c
    branches/ge_harmony/source/blender/blenlib/intern/scanfill.c
    branches/ge_harmony/source/blender/blenlib/intern/string_utf8.c
    branches/ge_harmony/source/blender/blenlib/intern/voronoi.c
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/blenloader/intern/readfile.h
    branches/ge_harmony/source/blender/blenloader/intern/undofile.c
    branches/ge_harmony/source/blender/blenloader/intern/versioning_legacy.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_create.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.c
    branches/ge_harmony/source/blender/collada/AnimationImporter.cpp
    branches/ge_harmony/source/blender/collada/AnimationImporter.h
    branches/ge_harmony/source/blender/collada/CameraExporter.cpp
    branches/ge_harmony/source/blender/collada/DocumentImporter.cpp
    branches/ge_harmony/source/blender/compositor/COM_compositor.h
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/ge_harmony/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/ge_harmony/source/blender/compositor/intern/COM_NodeOperation.h
    branches/ge_harmony/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_OpenCLDevice.h
    branches/ge_harmony/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_compositor.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BokehImageNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BrightnessNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ColorNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_GammaNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_IDMaskNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_InvertNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_MaskNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_MuteNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_MuteNode.h
    branches/ge_harmony/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_TimeNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_TonemapNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ValueNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_DilateErodeOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ImageOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_KeyingScreenOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MaskOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MovieClipOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
    branches/ge_harmony/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_TextureOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/ge_harmony/source/blender/editors/armature/editarmature.c
    branches/ge_harmony/source/blender/editors/armature/editarmature_retarget.c
    branches/ge_harmony/source/blender/editors/curve/editcurve.c
    branches/ge_harmony/source/blender/editors/curve/editfont.c
    branches/ge_harmony/source/blender/editors/include/ED_clip.h
    branches/ge_harmony/source/blender/editors/include/ED_image.h
    branches/ge_harmony/source/blender/editors/include/ED_mask.h
    branches/ge_harmony/source/blender/editors/include/ED_node.h
    branches/ge_harmony/source/blender/editors/include/ED_object.h
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/interface/interface_draw.c
    branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
    branches/ge_harmony/source/blender/editors/interface/interface_layout.c
    branches/ge_harmony/source/blender/editors/interface/interface_panel.c
    branches/ge_harmony/source/blender/editors/interface/interface_regions.c
    branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
    branches/ge_harmony/source/blender/editors/io/io_collada.c
    branches/ge_harmony/source/blender/editors/mask/mask_add.c
    branches/ge_harmony/source/blender/editors/mask/mask_draw.c
    branches/ge_harmony/source/blender/editors/mask/mask_edit.c
    branches/ge_harmony/source/blender/editors/mask/mask_ops.c
    branches/ge_harmony/source/blender/editors/mask/mask_select.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_knife.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
    branches/ge_harmony/source/blender/editors/object/object_add.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_select.c
    branches/ge_harmony/source/blender/editors/render/render_internal.c
    branches/ge_harmony/source/blender/editors/render/render_opengl.c
    branches/ge_harmony/source/blender/editors/render/render_preview.c
    branches/ge_harmony/source/blender/editors/render/render_shading.c
    branches/ge_harmony/source/blender/editors/screen/area.c
    branches/ge_harmony/source/blender/editors/screen/glutil.c
    branches/ge_harmony/source/blender/editors/screen/screen_edit.c
    branches/ge_harmony/source/blender/editors/screen/screen_ops.c
    branches/ge_harmony/source/blender/editors/screen/screendump.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
    branches/ge_harmony/source/blender/editors/sound/sound_ops.c
    branches/ge_harmony/source/blender/editors/space_action/space_action.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_editor.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_intern.h
    branches/ge_harmony/source/blender/editors/space_clip/clip_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_toolbar.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_utils.c
    branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/tracking_select.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_edit.c
    branches/ge_harmony/source/blender/editors/space_graph/space_graph.c
    branches/ge_harmony/source/blender/editors/space_image/image_edit.c
    branches/ge_harmony/source/blender/editors/space_image/image_ops.c
    branches/ge_harmony/source/blender/editors/space_image/space_image.c
    branches/ge_harmony/source/blender/editors/space_info/info_ops.c
    branches/ge_harmony/source/blender/editors/space_logic/logic_ops.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_edit.c
    branches/ge_harmony/source/blender/editors/space_node/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_node/drawnode.c
    branches/ge_harmony/source/blender/editors/space_node/node_buttons.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_node/node_select.c
    branches/ge_harmony/source/blender/editors/space_node/node_templates.c
    branches/ge_harmony/source/blender/editors/space_node/space_node.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_add.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/ge_harmony/source/blender/editors/space_text/text_ops.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/transform/transform.c
    branches/ge_harmony/source/blender/editors/transform/transform_constraints.c
    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_snap.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_ops.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/ge_harmony/source/blender/gpu/GPU_draw.h
    branches/ge_harmony/source/blender/gpu/intern/gpu_draw.c
    branches/ge_harmony/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/ge_harmony/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/ge_harmony/source/blender/imbuf/intern/IMB_indexer.h
    branches/ge_harmony/source/blender/imbuf/intern/anim_movie.c
    branches/ge_harmony/source/blender/imbuf/intern/divers.c
    branches/ge_harmony/source/blender/imbuf/intern/imageprocess.c
    branches/ge_harmony/source/blender/imbuf/intern/jpeg.c
    branches/ge_harmony/source/blender/imbuf/intern/radiance_hdr.c
    branches/ge_harmony/source/blender/imbuf/intern/scaling.c
    branches/ge_harmony/source/blender/makesdna/DNA_ID.h
    branches/ge_harmony/source/blender/makesdna/DNA_mask_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_material_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_node_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/makesdna/DNA_texture_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_vfont_types.h
    branches/ge_harmony/source/blender/makesdna/intern/makesdna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ID.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_cloth.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mask.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_movieclip.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nla.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_rna.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/makesrna/intern/rna_vfont.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_ocean.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_skin.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.c
    branches/ge_harmony/source/blender/render/extern/include/RE_pipeline.h
    branches/ge_harmony/source/blender/render/intern/include/zbuf.h
    branches/ge_harmony/source/blender/render/intern/raytrace/bvh.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/ge_harmony/source/blender/render/intern/source/convertblender.c
    branches/ge_harmony/source/blender/render/intern/source/envmap.c
    branches/ge_harmony/source/blender/render/intern/source/imagetexture.c
    branches/ge_harmony/source/blender/render/intern/source/pipeline.c
    branches/ge_harmony/source/blender/render/intern/source/rayshade.c
    branches/ge_harmony/source/blender/render/intern/source/render_texture.c
    branches/ge_harmony/source/blender/render/intern/source/rendercore.c
    branches/ge_harmony/source/blender/render/intern/source/shadbuf.c
    branches/ge_harmony/source/blender/render/intern/source/sss.c
    branches/ge_harmony/source/blender/render/intern/source/zbuf.c
    branches/ge_harmony/source/blender/windowmanager/WM_api.h
    branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_files.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_init_exit.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
    branches/ge_harmony/source/blenderplayer/CMakeLists.txt
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/ge_harmony/source/creator/CMakeLists.txt
    branches/ge_harmony/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureObject.h
    branches/ge_harmony/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/ge_harmony/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/ge_harmony/source/gameengine/Ketsji/BL_Texture.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Dome.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Light.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/ge_harmony/source/gameengine/Physics/common/PHY_DynamicTypes.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageRender.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/SConscript
    branches/ge_harmony/source/tools/check_style_c.py
    branches/ge_harmony/source/tools/spell_check_source.py

Added Paths:
-----------
    branches/ge_harmony/extern/bullet2/patches/ghost_character.patch
    branches/ge_harmony/intern/bsp/intern/BOP_CarveInterface.cpp
    branches/ge_harmony/intern/bsp/intern/BOP_Interface.h
    branches/ge_harmony/release/scripts/presets/tracking_settings/planar.py
    branches/ge_harmony/release/scripts/templates/ui_panel.py
    branches/ge_harmony/source/blender/editors/space_node/node_add.c
    branches/ge_harmony/source/blender/editors/space_node/node_group.c
    branches/ge_harmony/source/blender/editors/space_node/node_relationships.c
    branches/ge_harmony/source/blender/editors/space_node/node_view.c

Removed Paths:
-------------
    branches/ge_harmony/intern/boolop/CMakeLists.txt
    branches/ge_harmony/intern/boolop/SConscript
    branches/ge_harmony/intern/boolop/extern/BOP_Interface.h
    branches/ge_harmony/intern/boolop/intern/BOP_BBox.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_BBox.h
    branches/ge_harmony/intern/boolop/intern/BOP_BSPNode.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_BSPNode.h
    branches/ge_harmony/intern/boolop/intern/BOP_BSPTree.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_BSPTree.h
    branches/ge_harmony/intern/boolop/intern/BOP_CarveInterface.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Chrono.h
    branches/ge_harmony/intern/boolop/intern/BOP_Edge.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Edge.h
    branches/ge_harmony/intern/boolop/intern/BOP_Face.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Face.h
    branches/ge_harmony/intern/boolop/intern/BOP_Face2Face.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Face2Face.h
    branches/ge_harmony/intern/boolop/intern/BOP_Indexs.h
    branches/ge_harmony/intern/boolop/intern/BOP_Interface.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_MathUtils.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_MathUtils.h
    branches/ge_harmony/intern/boolop/intern/BOP_Merge.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Merge.h
    branches/ge_harmony/intern/boolop/intern/BOP_Merge2.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/boolop/intern/BOP_Misc.h
    branches/ge_harmony/intern/boolop/intern/BOP_Segment.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Segment.h
    branches/ge_harmony/intern/boolop/intern/BOP_Splitter.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Splitter.h
    branches/ge_harmony/intern/boolop/intern/BOP_Tag.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Tag.h
    branches/ge_harmony/intern/boolop/intern/BOP_Triangulator.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Triangulator.h
    branches/ge_harmony/intern/boolop/intern/BOP_Vertex.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Vertex.h
    branches/ge_harmony/intern/bsp/test/
    branches/ge_harmony/release/scripts/presets/tracking_settings/blurry_movie.py
    branches/ge_harmony/source/blender/editors/space_node/node_state.c

Property Changed:
----------------
    branches/ge_harmony/
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/space_outliner/


Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087
/trunk/blender:48067-49271
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:48067-49567

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2012-08-04 22:33:43 UTC (rev 49567)
+++ branches/ge_harmony/CMakeLists.txt	2012-08-05 01:50:08 UTC (rev 49568)
@@ -226,9 +226,6 @@
 # Camera/motion tracking
 option(WITH_LIBMV         "Enable libmv structure from motion library" ON)
 
-# Mesh boolean lib
-option(WITH_CARVE         "Enable Carve library to handle mesh boolean operations" ON)
-
 # Misc
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON)
@@ -364,8 +361,8 @@
 	set(WITH_OPENIMAGEIO ON)
 endif()
 
-# auto enable boost for cycles and carve
-if(WITH_CYCLES OR WITH_CARVE)
+# auto enable boost for cycles and booleans
+if(WITH_CYCLES OR WITH_MOD_BOOLEAN)
 	set(WITH_BOOST ON)
 endif()
 
@@ -856,7 +853,7 @@
 		if(WITH_MOD_CLOTH_ELTOPO)
 			set(LAPACK ${LIBDIR}/lapack)
 			# set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
-			set_lib_path(LAPACK_LIBPATH ${LAPACK}/lib)	
+			set(LAPACK_LIBPATH ${LAPACK}/lib)	
 			set(LAPACK_LIBRARIES
 				${LIBDIR}/lapack/lib/libf2c.lib
 				${LIBDIR}/lapack/lib/clapack_nowrap.lib
@@ -896,6 +893,7 @@
 		endif()
 
 		if(WITH_OPENCOLLADA)
+			set(OPENCOLLADA ${LIBDIR}/opencollada)
 
 			set(OPENCOLLADA_INCLUDE_DIRS
 				${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
@@ -904,23 +902,22 @@
 				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
 				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
 			)
-			
-			set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib")
+			set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
 
 			set(OPENCOLLADA_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib
-				${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib
-				${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib
-				${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib
-				${OPENCOLLADA_LIBPATH}/MathMLSolver.lib
-				${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib
-				${OPENCOLLADA_LIBPATH}/xml2.lib
-				${OPENCOLLADA_LIBPATH}/buffer.lib
-				${OPENCOLLADA_LIBPATH}/ftoa.lib
-				${OPENCOLLADA_LIBPATH}/UTF.lib
+				${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADASaxFrameworkLoader.lib
+				${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAFramework.lib
+				${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADABaseUtils.lib
+				${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAStreamWriter.lib
+				${OPENCOLLADA_LIBPATH}/lib/MathMLSolver.lib
+				${OPENCOLLADA_LIBPATH}/lib/GeneratedSaxParser.lib
+				${OPENCOLLADA_LIBPATH}/lib/xml2.lib
+				${OPENCOLLADA_LIBPATH}/lib/buffer.lib
+				${OPENCOLLADA_LIBPATH}/lib/ftoa.lib
+				${OPENCOLLADA_LIBPATH}/lib/UTF.lib
 			)
 			set(PCRE_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/pcre.lib
+				${OPENCOLLADA_LIBPATH}/lib/pcre.lib
 			)
 			
 			unset(OPENCOLLADA_LIBPATH)
@@ -943,7 +940,8 @@
 
 		if(WITH_IMAGE_OPENEXR)
 			set_lib_path(OPENEXR "openexr")
-			set_lib_path(OPENEXR_LIBPATH "openexr/lib")
+			set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
+			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 			set(OPENEXR_LIBRARIES
 				${OPENEXR_LIBPATH}/Iex.lib
 				${OPENEXR_LIBPATH}/Half.lib
@@ -951,15 +949,12 @@
 				${OPENEXR_LIBPATH}/Imath.lib
 				${OPENEXR_LIBPATH}/IlmThread.lib
 			)
-			set_lib_path(OPENEXR_INCUDE "openexr/include")
 			set(OPENEXR_INCLUDE_DIRS
-				${OPENEXR_INCUDE}
-				${OPENEXR_INCUDE}/IlmImf
-				${OPENEXR_INCUDE}/Iex
-				${OPENEXR_INCUDE}/Imath
+				${OPENEXR_INCLUDE_DIR}
+				${OPENEXR_INCLUDE_DIR}/IlmImf
+				${OPENEXR_INCLUDE_DIR}/Iex
+				${OPENEXR_INCLUDE_DIR}/Imath
 			)
-			unset(OPENEXR_INCUDE)
-			unset(OPENEXR_LIBPATH)
 		endif()
 
 		if(WITH_IMAGE_TIFF)
@@ -978,8 +973,9 @@
 		if(WITH_PYTHON)
 			# normally cached but not since we include them with blender
 			set(PYTHON_VERSION 3.2) # CACHE STRING)
-			set_lib_path(PYTHON_INCLUDE_DIR "python/include/python${PYTHON_VERSION}")
-			set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib") #CACHE FILEPATH)
+			set_lib_path(PYTHON "python")
+			set(PYTHON_INCLUDE_DIR ${PYTHON}/include/python${PYTHON_VERSION})
+			set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
 			
 			# uncached vars
 			set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
@@ -1010,7 +1006,7 @@
 			set(OPENIMAGEIO ${LIBDIR}/openimageio)
 			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
-			set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib")
+			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 
@@ -1651,9 +1647,6 @@
 
 # MSVC2010 fails to links C++ libs right
 if(MSVC10)
-	if(WITH_IMAGE_OPENEXR)
-		message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
-	endif()
 	if(WITH_OPENCOLLADA)
 		message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
 	endif()

Modified: branches/ge_harmony/build_files/buildbot/slave_pack.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/slave_pack.py	2012-08-04 22:33:43 UTC (rev 49567)
+++ branches/ge_harmony/build_files/buildbot/slave_pack.py	2012-08-05 01:50:08 UTC (rev 49568)
@@ -55,11 +55,14 @@
             'WITHOUT_BF_INSTALL=True']
 
         config = None
+        bits = None
 
         if builder.endswith('linux_x86_64_scons'):
             config = 'user-config-x86_64.py'
+            bits = 64
         elif builder.endswith('linux_i386_scons'):
-            config = 'user-config-x86_64.py'
+            config = 'user-config-i686.py'
+            bits = 32
 
         if config is not None:
             config_fpath = os.path.join(config_dir, config)
@@ -69,7 +72,16 @@
         blenderplayer = os.path.join(install_dir, 'blenderplayer')
         subprocess.call(['strip', '--strip-all', blender, blenderplayer])
 
+        extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
+        mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
+        software_gl = os.path.join(extra, 'blender-softwaregl')
+
+        os.system('tar -xpf %s -C %s' % (mesalibs, install_dir))
+        os.system('cp %s %s' % (software_gl, install_dir))
+        os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
+
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+
         sys.exit(retcode)
     else:
         if builder.find('win') != -1:

Modified: branches/ge_harmony/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/ge_harmony/build_files/cmake/config/blender_lite.cmake	2012-08-04 22:33:43 UTC (rev 49567)
+++ branches/ge_harmony/build_files/cmake/config/blender_lite.cmake	2012-08-05 01:50:08 UTC (rev 49568)
@@ -15,7 +15,6 @@
 set(WITH_CYCLES              OFF CACHE FORCE BOOL)
 set(WITH_FFTW3               OFF CACHE FORCE BOOL)
 set(WITH_LIBMV               OFF CACHE FORCE BOOL)
-set(WITH_CARVE               OFF CACHE FORCE BOOL)
 set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
 set(WITH_COMPOSITOR          OFF CACHE FORCE BOOL)
 set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)

Modified: branches/ge_harmony/build_files/cmake/macros.cmake
===================================================================
--- branches/ge_harmony/build_files/cmake/macros.cmake	2012-08-04 22:33:43 UTC (rev 49567)
+++ branches/ge_harmony/build_files/cmake/macros.cmake	2012-08-05 01:50:08 UTC (rev 49568)
@@ -719,12 +719,9 @@
 		lvar
 		lproj)
 
-	
-	if(MSVC10 AND EXISTS ${LIBDIR}/vc2010/${lproj})
-		set(${lvar} ${LIBDIR}/vc2010/${lproj})
+	if(MSVC10)
+		set(${lvar} ${LIBDIR}/${lproj}/vc2010)
 	else()
 		set(${lvar} ${LIBDIR}/${lproj})
 	endif()
-
-
 endmacro()

Modified: branches/ge_harmony/build_files/scons/tools/Blender.py
===================================================================
--- branches/ge_harmony/build_files/scons/tools/Blender.py	2012-08-04 22:33:43 UTC (rev 49567)
+++ branches/ge_harmony/build_files/scons/tools/Blender.py	2012-08-05 01:50:08 UTC (rev 49568)
@@ -693,11 +693,23 @@
     run("rm -r '%s/turtle.py'" % py_target)
     run("rm -f '%s/lib-dynload/_tkinter.so'" % py_target)
 
+    if env['WITH_BF_PYTHON_INSTALL_NUMPY']:
+        numpy_src = py_src + "/site-packages/numpy"
+        numpy_target = py_target + "/site-packages/numpy"
+
+        if os.path.exists(numpy_src):
+            print 'Install numpy from:'
+            print '\t"%s" into...' % numpy_src
+            print '\t"%s"\n' % numpy_target
+
+            run("cp -R '%s' '%s'" % (numpy_src, os.path.dirname(numpy_target)))
+        else:
+            print 'Failed to find numpy at %s, skipping copying' % numpy_src
+
     run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" % py_target)
     run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" % py_target)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list