[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49509] branches/soc-2012-sushi: svn merge ^/trunk/blender -r49085:49508
Alexander Pinzon
apinzonf at gmail.com
Thu Aug 2 20:51:16 CEST 2012
Revision: 49509
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49509
Author: apinzonf
Date: 2012-08-02 18:51:16 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49085:49508
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49085
Modified Paths:
--------------
branches/soc-2012-sushi/CMakeLists.txt
branches/soc-2012-sushi/SConstruct
branches/soc-2012-sushi/build_files/buildbot/slave_pack.py
branches/soc-2012-sushi/build_files/cmake/config/blender_lite.cmake
branches/soc-2012-sushi/build_files/scons/config/darwin-config.py
branches/soc-2012-sushi/build_files/scons/tools/Blender.py
branches/soc-2012-sushi/build_files/scons/tools/btools.py
branches/soc-2012-sushi/doc/python_api/examples/bpy.ops.2.py
branches/soc-2012-sushi/doc/python_api/rst/bge.logic.rst
branches/soc-2012-sushi/doc/python_api/rst/info_best_practice.rst
branches/soc-2012-sushi/doc/python_api/sphinx_doc_gen.py
branches/soc-2012-sushi/extern/CMakeLists.txt
branches/soc-2012-sushi/extern/SConscript
branches/soc-2012-sushi/extern/bullet2/readme.txt
branches/soc-2012-sushi/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/soc-2012-sushi/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2012-sushi/extern/libmv/libmv/simple_pipeline/detect.cc
branches/soc-2012-sushi/extern/libmv/third_party/ceres/include/ceres/jet.h
branches/soc-2012-sushi/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
branches/soc-2012-sushi/extern/recastnavigation/Recast/Source/RecastContour.cpp
branches/soc-2012-sushi/extern/recastnavigation/Recast/Source/RecastMesh.cpp
branches/soc-2012-sushi/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/soc-2012-sushi/intern/CMakeLists.txt
branches/soc-2012-sushi/intern/SConscript
branches/soc-2012-sushi/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2012-sushi/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/soc-2012-sushi/intern/audaspace/FX/AUD_FaderFactory.h
branches/soc-2012-sushi/intern/audaspace/intern/AUD_3DMath.h
branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.h
branches/soc-2012-sushi/intern/bsp/CMakeLists.txt
branches/soc-2012-sushi/intern/bsp/SConscript
branches/soc-2012-sushi/intern/bsp/intern/CSG_BooleanOps.cpp
branches/soc-2012-sushi/intern/cycles/blender/blender_object.cpp
branches/soc-2012-sushi/intern/cycles/blender/blender_particles.cpp
branches/soc-2012-sushi/intern/cycles/blender/blender_sync.cpp
branches/soc-2012-sushi/intern/cycles/blender/blender_sync.h
branches/soc-2012-sushi/intern/cycles/bvh/bvh.cpp
branches/soc-2012-sushi/intern/cycles/device/device_opencl.cpp
branches/soc-2012-sushi/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2012-sushi/intern/cycles/kernel/kernel_object.h
branches/soc-2012-sushi/intern/cycles/kernel/kernel_path.h
branches/soc-2012-sushi/intern/cycles/kernel/kernel_types.h
branches/soc-2012-sushi/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2012-sushi/intern/cycles/kernel/svm/svm_types.h
branches/soc-2012-sushi/intern/cycles/render/light.cpp
branches/soc-2012-sushi/intern/cycles/render/nodes.cpp
branches/soc-2012-sushi/intern/cycles/render/object.cpp
branches/soc-2012-sushi/intern/cycles/render/object.h
branches/soc-2012-sushi/intern/cycles/subd/subd_build.cpp
branches/soc-2012-sushi/intern/cycles/util/util_cache.cpp
branches/soc-2012-sushi/intern/cycles/util/util_path.cpp
branches/soc-2012-sushi/intern/decimation/intern/LOD_QuadricEditor.cpp
branches/soc-2012-sushi/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
branches/soc-2012-sushi/intern/elbeem/intern/mvmcoords.cpp
branches/soc-2012-sushi/intern/ghost/GHOST_IWindow.h
branches/soc-2012-sushi/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/soc-2012-sushi/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/soc-2012-sushi/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2012-sushi/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2012-sushi/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2012-sushi/intern/ghost/intern/GHOST_Window.h
branches/soc-2012-sushi/intern/ghost/intern/GHOST_WindowNULL.h
branches/soc-2012-sushi/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2012-sushi/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2012-sushi/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2012-sushi/intern/guardedalloc/intern/mallocn.c
branches/soc-2012-sushi/intern/iksolver/extern/IK_solver.h
branches/soc-2012-sushi/intern/iksolver/intern/IK_QJacobian.cpp
branches/soc-2012-sushi/intern/iksolver/intern/IK_QJacobianSolver.cpp
branches/soc-2012-sushi/intern/iksolver/intern/IK_QJacobianSolver.h
branches/soc-2012-sushi/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2012-sushi/intern/iksolver/intern/IK_QSegment.h
branches/soc-2012-sushi/intern/iksolver/intern/IK_QTask.cpp
branches/soc-2012-sushi/intern/iksolver/intern/IK_QTask.h
branches/soc-2012-sushi/intern/iksolver/intern/IK_Solver.cpp
branches/soc-2012-sushi/intern/iksolver/intern/MT_ExpMap.cpp
branches/soc-2012-sushi/intern/itasc/Armature.cpp
branches/soc-2012-sushi/intern/itasc/kdl/utilities/utility_io.cpp
branches/soc-2012-sushi/intern/memutil/MEM_RefCountPtr.h
branches/soc-2012-sushi/intern/raskter/raskter.c
branches/soc-2012-sushi/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/check_po.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/clean_po.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/merge_po.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/update_branches.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/update_mo.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/update_po.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/update_pot.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/update_trunk.py
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2012-sushi/release/scripts/modules/bpy/utils.py
branches/soc-2012-sushi/release/scripts/modules/console_python.py
branches/soc-2012-sushi/release/scripts/modules/sys_info.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/__init__.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_image.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_text.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_time.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2012-sushi/source/blender/avi/intern/avi.c
branches/soc-2012-sushi/source/blender/blenfont/intern/blf_lang.c
branches/soc-2012-sushi/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_mesh.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_node.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_paint.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_tracking.h
branches/soc-2012-sushi/source/blender/blenkernel/intern/action.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/anim.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/boids.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/brush.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/collision.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/colortools.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/constraint.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/context.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/curve.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/displist.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/image.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/ipo.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/library.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/mask.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/material.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/movieclip.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/multires.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/node.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/object.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/ocean.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/paint.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/scene.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/screen.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/softbody.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2012-sushi/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2012-sushi/source/blender/blenlib/BLI_memarena.h
branches/soc-2012-sushi/source/blender/blenlib/intern/BLI_args.c
branches/soc-2012-sushi/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2012-sushi/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2012-sushi/source/blender/blenlib/intern/bpath.c
branches/soc-2012-sushi/source/blender/blenlib/intern/freetypefont.c
branches/soc-2012-sushi/source/blender/blenlib/intern/lasso.c
branches/soc-2012-sushi/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2012-sushi/source/blender/blenlib/intern/math_geom.c
branches/soc-2012-sushi/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-sushi/source/blender/blenlib/intern/pbvh.c
branches/soc-2012-sushi/source/blender/blenlib/intern/scanfill.c
branches/soc-2012-sushi/source/blender/blenlib/intern/voronoi.c
branches/soc-2012-sushi/source/blender/blenloader/intern/readfile.c
branches/soc-2012-sushi/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2012-sushi/source/blender/bmesh/bmesh_class.h
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_mesh.h
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_create.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2012-sushi/source/blender/collada/AnimationImporter.cpp
branches/soc-2012-sushi/source/blender/collada/GeometryExporter.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_ColorNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_MuteNode.h
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_ValueNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2012-sushi/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2012-sushi/source/blender/editors/animation/anim_filter.c
branches/soc-2012-sushi/source/blender/editors/animation/keyframes_draw.c
branches/soc-2012-sushi/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2012-sushi/source/blender/editors/include/ED_clip.h
branches/soc-2012-sushi/source/blender/editors/include/ED_image.h
branches/soc-2012-sushi/source/blender/editors/include/ED_mask.h
branches/soc-2012-sushi/source/blender/editors/include/ED_node.h
branches/soc-2012-sushi/source/blender/editors/include/ED_object.h
branches/soc-2012-sushi/source/blender/editors/include/ED_sequencer.h
branches/soc-2012-sushi/source/blender/editors/include/ED_uvedit.h
branches/soc-2012-sushi/source/blender/editors/include/UI_resources.h
branches/soc-2012-sushi/source/blender/editors/interface/interface.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_draw.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_icons.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_layout.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_panel.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_regions.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_templates.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-sushi/source/blender/editors/interface/resources.c
branches/soc-2012-sushi/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-sushi/source/blender/editors/mask/mask_add.c
branches/soc-2012-sushi/source/blender/editors/mask/mask_draw.c
branches/soc-2012-sushi/source/blender/editors/mask/mask_edit.c
branches/soc-2012-sushi/source/blender/editors/mask/mask_intern.h
branches/soc-2012-sushi/source/blender/editors/mask/mask_ops.c
branches/soc-2012-sushi/source/blender/editors/mask/mask_select.c
branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2012-sushi/source/blender/editors/mesh/meshtools.c
branches/soc-2012-sushi/source/blender/editors/object/object_add.c
branches/soc-2012-sushi/source/blender/editors/object/object_modifier.c
branches/soc-2012-sushi/source/blender/editors/object/object_relations.c
branches/soc-2012-sushi/source/blender/editors/object/object_select.c
branches/soc-2012-sushi/source/blender/editors/object/object_vgroup.c
branches/soc-2012-sushi/source/blender/editors/physics/particle_boids.c
branches/soc-2012-sushi/source/blender/editors/render/render_internal.c
branches/soc-2012-sushi/source/blender/editors/render/render_opengl.c
branches/soc-2012-sushi/source/blender/editors/screen/glutil.c
branches/soc-2012-sushi/source/blender/editors/screen/screen_ops.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2012-sushi/source/blender/editors/space_action/space_action.c
branches/soc-2012-sushi/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_draw.c
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_editor.c
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_intern.h
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_utils.c
branches/soc-2012-sushi/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-sushi/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-sushi/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-sushi/source/blender/editors/space_console/console_draw.c
branches/soc-2012-sushi/source/blender/editors/space_file/file_ops.c
branches/soc-2012-sushi/source/blender/editors/space_file/filesel.c
branches/soc-2012-sushi/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2012-sushi/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-sushi/source/blender/editors/space_image/image_draw.c
branches/soc-2012-sushi/source/blender/editors/space_image/image_ops.c
branches/soc-2012-sushi/source/blender/editors/space_image/space_image.c
branches/soc-2012-sushi/source/blender/editors/space_info/info_draw.c
branches/soc-2012-sushi/source/blender/editors/space_logic/logic_ops.c
branches/soc-2012-sushi/source/blender/editors/space_nla/nla_edit.c
branches/soc-2012-sushi/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2012-sushi/source/blender/editors/space_node/drawnode.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_draw.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_edit.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_intern.h
branches/soc-2012-sushi/source/blender/editors/space_node/node_ops.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_select.c
branches/soc-2012-sushi/source/blender/editors/space_node/space_node.c
branches/soc-2012-sushi/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2012-sushi/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-sushi/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-sushi/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-sushi/source/blender/editors/transform/transform.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_constraints.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_generics.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_manipulator.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_snap.c
branches/soc-2012-sushi/source/blender/editors/util/undo.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2012-sushi/source/blender/gpu/GPU_draw.h
branches/soc-2012-sushi/source/blender/gpu/GPU_material.h
branches/soc-2012-sushi/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-sushi/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-sushi/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2012-sushi/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2012-sushi/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-sushi/source/blender/imbuf/intern/divers.c
branches/soc-2012-sushi/source/blender/imbuf/intern/filter.c
branches/soc-2012-sushi/source/blender/imbuf/intern/imageprocess.c
branches/soc-2012-sushi/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2012-sushi/source/blender/imbuf/intern/scaling.c
branches/soc-2012-sushi/source/blender/makesdna/DNA_ID.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-sushi/source/blender/makesdna/intern/makesdna.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_access.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_curve.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_main.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_nla.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_rna.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_array.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2012-sushi/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2012-sushi/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2012-sushi/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2012-sushi/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2012-sushi/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2012-sushi/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2012-sushi/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2012-sushi/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-sushi/source/blender/python/generic/bpy_internal_import.c
branches/soc-2012-sushi/source/blender/python/intern/bpy_rna.c
branches/soc-2012-sushi/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2012-sushi/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2012-sushi/source/blender/render/intern/raytrace/bvh.h
branches/soc-2012-sushi/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2012-sushi/source/blender/render/intern/source/convertblender.c
branches/soc-2012-sushi/source/blender/render/intern/source/envmap.c
branches/soc-2012-sushi/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-sushi/source/blender/render/intern/source/pipeline.c
branches/soc-2012-sushi/source/blender/render/intern/source/rayshade.c
branches/soc-2012-sushi/source/blender/render/intern/source/render_texture.c
branches/soc-2012-sushi/source/blender/render/intern/source/rendercore.c
branches/soc-2012-sushi/source/blender/render/intern/source/renderdatabase.c
branches/soc-2012-sushi/source/blender/render/intern/source/shadbuf.c
branches/soc-2012-sushi/source/blender/render/intern/source/sss.c
branches/soc-2012-sushi/source/blender/render/intern/source/strand.c
branches/soc-2012-sushi/source/blender/render/intern/source/zbuf.c
branches/soc-2012-sushi/source/blender/windowmanager/WM_api.h
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_files.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2012-sushi/source/blenderplayer/CMakeLists.txt
branches/soc-2012-sushi/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-sushi/source/creator/CMakeLists.txt
branches/soc-2012-sushi/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2012-sushi/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2012-sushi/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2012-sushi/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2012-sushi/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2012-sushi/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2012-sushi/source/gameengine/Expressions/ListValue.h
branches/soc-2012-sushi/source/gameengine/Expressions/VoidValue.h
branches/soc-2012-sushi/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2012-sushi/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2012-sushi/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2012-sushi/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/soc-2012-sushi/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_RadarSensor.h
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_WorldInfo.h
branches/soc-2012-sushi/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2012-sushi/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2012-sushi/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2012-sushi/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2012-sushi/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2012-sushi/source/gameengine/SceneGraph/SG_BBox.cpp
branches/soc-2012-sushi/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/soc-2012-sushi/source/gameengine/SceneGraph/SG_Tree.cpp
branches/soc-2012-sushi/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2012-sushi/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2012-sushi/source/gameengine/VideoTexture/SConscript
branches/soc-2012-sushi/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2012-sushi/source/tools/check_style_c.py
branches/soc-2012-sushi/source/tools/spell_check_source.py
branches/soc-2012-sushi/source/tools/spell_check_source_config.py
Added Paths:
-----------
branches/soc-2012-sushi/extern/bullet2/patches/ghost_character.patch
branches/soc-2012-sushi/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2012-sushi/intern/bsp/intern/BOP_Interface.h
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2012-sushi/release/scripts/templates/ui_panel.py
branches/soc-2012-sushi/source/blender/editors/space_image/image_edit.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_add.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_group.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_relationships.c
Removed Paths:
-------------
branches/soc-2012-sushi/intern/boolop/CMakeLists.txt
branches/soc-2012-sushi/intern/boolop/SConscript
branches/soc-2012-sushi/intern/boolop/extern/BOP_Interface.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_BBox.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_BBox.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_BSPNode.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_BSPNode.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_BSPTree.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_BSPTree.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_CarveInterface.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Chrono.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Edge.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Edge.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Face.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Face.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Face2Face.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Face2Face.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Indexs.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_MathUtils.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_MathUtils.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Merge.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Merge.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Merge2.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Merge2.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Mesh.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Misc.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Segment.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Segment.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Splitter.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Splitter.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Tag.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Tag.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Triangulator.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Triangulator.h
branches/soc-2012-sushi/intern/boolop/intern/BOP_Vertex.cpp
branches/soc-2012-sushi/intern/boolop/intern/BOP_Vertex.h
Property Changed:
----------------
branches/soc-2012-sushi/
branches/soc-2012-sushi/source/blender/editors/interface/interface.c
branches/soc-2012-sushi/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-sushi
___________________________________________________________________
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
/trunk/blender:46810-49085
+ /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:46810-49508
Modified: branches/soc-2012-sushi/CMakeLists.txt
===================================================================
--- branches/soc-2012-sushi/CMakeLists.txt 2012-08-02 16:42:30 UTC (rev 49508)
+++ branches/soc-2012-sushi/CMakeLists.txt 2012-08-02 18:51:16 UTC (rev 49509)
@@ -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()
@@ -1122,10 +1119,17 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
- set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+ if(MSVC10)
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/vc_10)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib/vc_10)
+ else()
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+ endif()
endif()
if(WITH_IMAGE_TIFF)
@@ -1651,9 +1655,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/soc-2012-sushi/SConstruct
===================================================================
--- branches/soc-2012-sushi/SConstruct 2012-08-02 16:42:30 UTC (rev 49508)
+++ branches/soc-2012-sushi/SConstruct 2012-08-02 18:51:16 UTC (rev 49509)
@@ -280,8 +280,10 @@
if env['OURPLATFORM']=='darwin':
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"
+ if not 'Mac OS X 10.6' in env['MACOSX_SDK_CHECK']:
+ print B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.7.sdk"
+ elif not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
+ print B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
else:
print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
Modified: branches/soc-2012-sushi/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2012-sushi/build_files/buildbot/slave_pack.py 2012-08-02 16:42:30 UTC (rev 49508)
+++ branches/soc-2012-sushi/build_files/buildbot/slave_pack.py 2012-08-02 18:51:16 UTC (rev 49509)
@@ -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/soc-2012-sushi/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2012-sushi/build_files/cmake/config/blender_lite.cmake 2012-08-02 16:42:30 UTC (rev 49508)
+++ branches/soc-2012-sushi/build_files/cmake/config/blender_lite.cmake 2012-08-02 18:51:16 UTC (rev 49509)
@@ -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/soc-2012-sushi/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2012-sushi/build_files/scons/config/darwin-config.py 2012-08-02 16:42:30 UTC (rev 49508)
+++ branches/soc-2012-sushi/build_files/scons/config/darwin-config.py 2012-08-02 18:51:16 UTC (rev 49509)
@@ -32,6 +32,8 @@
MAC_CUR_VER='10.6'
elif cmd_res[:2]=='11':
MAC_CUR_VER='10.7'
+elif cmd_res[:2]=='12':
+ MAC_CUR_VER='10.8'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
@@ -75,7 +77,7 @@
LCGDIR = '#../lib/darwin-9.x.universal'
CC = 'gcc-4.2'
CXX = 'g++-4.2'
- else:
+ elif 'Mac OS X 10.6' in MACOSX_SDK_CHECK:
# OSX 10.6/7 with Xcode 4.x
MAC_MIN_VERS = '10.6'
MACOSX_DEPLOYMENT_TARGET = '10.6'
@@ -83,6 +85,14 @@
LCGDIR = '#../lib/darwin-9.x.universal'
CC = 'gcc-4.2'
CXX = 'g++-4.2'
+ else:
+ # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! )
+ MAC_MIN_VERS = '10.6'
+ MACOSX_DEPLOYMENT_TARGET = '10.6'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.7.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc'
+ CXX = 'g++'
LIBDIR = '${LCGDIR}'
@@ -333,8 +343,8 @@
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
-#for 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_DEPLOYMENT_TARGET == '10.7':
+#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
LLIBS = ['stdc++']
else:
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2012-sushi/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2012-sushi/build_files/scons/tools/Blender.py 2012-08-02 16:42:30 UTC (rev 49508)
+++ branches/soc-2012-sushi/build_files/scons/tools/Blender.py 2012-08-02 18:51:16 UTC (rev 49509)
@@ -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)
run("find '%s' -name '*.py[co]' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.so' -exec strip -s {} ';'" % py_target)
-
#### END ACTION STUFF #########
Modified: branches/soc-2012-sushi/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2012-sushi/build_files/scons/tools/btools.py 2012-08-02 16:42:30 UTC (rev 49508)
+++ branches/soc-2012-sushi/build_files/scons/tools/btools.py 2012-08-02 18:51:16 UTC (rev 49509)
@@ -135,7 +135,7 @@
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list