[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53282] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 53280.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Dec 23 01:23:12 CET 2012
Revision: 53282
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53282
Author: kjym3
Date: 2012-12-23 00:23:11 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 53280.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53280
Modified Paths:
--------------
branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.logic.rst
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libmv/ChangeLog
branches/soc-2008-mxcurioni/extern/libmv/bundle.sh
branches/soc-2008-mxcurioni/extern/libmv/files.txt
branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/tracks.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/tracks.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/gflags/README.libmv
branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/README.libmv
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_server.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_object.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_textures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_triangle.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_math.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/scene.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_types.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/release/datafiles/blender_icons.sh
branches/soc-2008-mxcurioni/release/datafiles/blender_icons.svg
branches/soc-2008-mxcurioni/release/datafiles/blender_icons16.png
branches/soc-2008-mxcurioni/release/datafiles/blender_icons32.png
branches/soc-2008-mxcurioni/release/scripts/modules/addon_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/scripts/templates/addon_add_object.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_draw.py
branches/soc-2008-mxcurioni/source/blender/avi/intern/avi_endian.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/gpencil.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/paint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pbvh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_array.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/FlipDXT.cpp
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2008-mxcurioni/source/blender/python/SConscript
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_multires_bake.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/multires_bake.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/occlusion.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
branches/soc-2008-mxcurioni/source/tests/bl_load_addons.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf_toon.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_toon.cpp
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_restrict_state.py
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_format.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_format.h
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_format_py.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_LibLoadStatus.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_LibLoadStatus.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonJoystick.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonJoystick.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_soundfile.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/datafiles/blender_icons16.png
branches/soc-2008-mxcurioni/release/datafiles/blender_icons32.png
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_build_options.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_build_options.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_multires_bake.h
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-53146
+ /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,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-53280
Modified: branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh 2012-12-23 00:23:11 UTC (rev 53282)
@@ -1787,34 +1787,58 @@
INFO ""
INFO "If you're using CMake add this to your configuration flags:"
+ _buildargs=""
+
if $ALL_STATIC; then
- INFO " -D WITH_STATIC_LIBS=ON"
+ _1="-D WITH_STATIC_LIBS=ON"
+ INFO " $_1"
+ _buildargs="$_buildargs $_1"
fi
if [ -d $INST/boost ]; then
- INFO " -D BOOST_ROOT=$INST/boost"
- INFO " -D Boost_NO_SYSTEM_PATHS=ON"
+ _1="-D BOOST_ROOT=$INST/boost"
+ _2="-D Boost_NO_SYSTEM_PATHS=ON"
+ INFO " $_1"
+ INFO " $_2"
+ _buildargs="$_buildargs $_1 $_2"
elif $ALL_STATIC; then
- INFO " -D Boost_USE_ICU=ON"
+ _1="-D Boost_USE_ICU=ON"
+ INFO " $_1"
+ _buildargs="$_buildargs $_1"
fi
if [ -d $INST/osl -a $WITH_OSL == true ]; then
- INFO " -D CYCLES_OSL=$INST/osl"
- INFO " -D WITH_CYCLES_OSL=ON"
- INFO " -D LLVM_VERSION=$LLVM_VERSION_FOUND"
+ _1="-D CYCLES_OSL=$INST/osl"
+ _2="-D WITH_CYCLES_OSL=ON"
+ _3="-D LLVM_VERSION=$LLVM_VERSION_FOUND"
+ INFO " $_1"
+ INFO " $_2"
+ INFO " $_3"
+ _buildargs="$_buildargs $_1 $_2 $_3"
if [ -d $INST/llvm ]; then
- INFO " -D LLVM_DIRECTORY=$INST/llvm"
- INFO " -D LLVM_STATIC=ON"
+ _1="-D LLVM_DIRECTORY=$INST/llvm"
+ _2="-D LLVM_STATIC=ON"
+ INFO " $_1"
+ INFO " $_2"
+ _buildargs="$_buildargs $_1 $_2"
fi
fi
if [ -d $INST/ffmpeg ]; then
- INFO " -D WITH_CODEC_FFMPEG=ON"
- INFO " -D FFMPEG=$INST/ffmpeg"
- INFO " -D FFMPEG_LIBRARIES='avformat;avcodec;avutil;avdevice;swscale;rt;`print_info_ffmpeglink`'"
+ _1="-D WITH_CODEC_FFMPEG=ON"
+ _2="-D FFMPEG=$INST/ffmpeg"
+ _3="-D FFMPEG_LIBRARIES='avformat;avcodec;avutil;avdevice;swscale;rt;`print_info_ffmpeglink`'"
+ INFO " $_1"
+ INFO " $_2"
+ INFO " $_3"
+ _buildargs="$_buildargs $_1 $_2 $_3"
fi
INFO ""
+ INFO "Or even simpler, just run (in your build dir):"
+ INFO " make -j$THREADS BUILD_CMAKE_ARGS=\"$_buildargs\""
+
+ INFO ""
INFO "If you're using SCons add this to your user-config:"
if [ -d $INST/python-3.3 ]; then
@@ -1832,6 +1856,7 @@
if [ -d $INST/boost ]; then
INFO "BF_BOOST = '$INST/boost'"
+ INFO "WITH_BF_BOOST = True"
fi
if [ -d $INST/ffmpeg ]; then
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -103,7 +103,7 @@
WITH_BF_STATICFFTW3 = True
# JACK
-WITH_BF_JACK = True
+WITH_BF_JACK = False
WITH_BF_STATICJACK = True
BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -103,7 +103,7 @@
WITH_BF_STATICFFTW3 = True
# JACK
-WITH_BF_JACK = True
+WITH_BF_JACK = False
WITH_BF_STATICJACK = True
BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -92,7 +92,7 @@
WITH_BF_STATICFFTW3 = True
# JACK
-WITH_BF_JACK = True
+WITH_BF_JACK = False
# Cycles
WITH_BF_CYCLES = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -92,7 +92,7 @@
WITH_BF_STATICFFTW3 = True
# JACK
-WITH_BF_JACK = True
+WITH_BF_JACK = False
# Cycles
WITH_BF_CYCLES = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -103,7 +103,7 @@
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
# JACK
-WITH_BF_JACK = True
+WITH_BF_JACK = False
WITH_BF_STATICJACK = True
BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -103,7 +103,7 @@
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
# JACK
-WITH_BF_JACK = True
+WITH_BF_JACK = False
WITH_BF_STATICJACK = True
BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -98,7 +98,7 @@
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
# JACK
-WITH_BF_JACK = True
+WITH_BF_JACK = False
# Motion Tracking
WITH_BF_LIBMV = False
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -98,7 +98,7 @@
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
# JACK
-WITH_BF_JACK = True
+WITH_BF_JACK = False
# Motion Tracking
WITH_BF_LIBMV = False
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2012-12-23 00:23:11 UTC (rev 53282)
@@ -47,10 +47,10 @@
if (ver_base is not None) and (ver_char is not None) and (ver_cycle is not None):
# eg '2.56a-beta'
- if ver_cycle:
+ if ver_cycle != "release":
ver_display = "%s%s-%s" % (ver_base, ver_char, ver_cycle)
else:
- ver_display = "%s%s" % (ver_base, ver_char) # assume release
+ ver_display = "%s%s" % (ver_base, ver_char)
return ver_base, ver_display, ver_cycle
Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.logic.rst 2012-12-22 20:44:32 UTC (rev 53281)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.logic.rst 2012-12-23 00:23:11 UTC (rev 53282)
@@ -125,6 +125,10 @@
The current mouse wrapped in an :class:`~bge.types.SCA_PythonMouse` object.
+.. data:: joysticks
+
+ A list of attached joysticks. The list size it he maximum number of supported joysticks. If no joystick is available for a given slot, the slot is set to None.
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list