[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53236] branches/ge_harmony: Merged revisions 53053-53224 from trunk/blender

Daniel Stokes kupomail at gmail.com
Fri Dec 21 09:35:34 CET 2012 

Revision: 53236
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53236
Author:   kupoman
Date:     2012-12-21 08:35:26 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Merged revisions 53053-53224 from trunk/blender

Modified Paths:
--------------
    branches/ge_harmony/SConstruct
    branches/ge_harmony/build_files/build_environment/install_deps.sh
    branches/ge_harmony/build_files/scons/config/linux-config.py
    branches/ge_harmony/build_files/scons/tools/btools.py
    branches/ge_harmony/doc/python_api/rst/bge.logic.rst
    branches/ge_harmony/doc/python_api/rst/bge.types.rst
    branches/ge_harmony/extern/libmv/CMakeLists.txt
    branches/ge_harmony/extern/libmv/ChangeLog
    branches/ge_harmony/extern/libmv/bundle.sh
    branches/ge_harmony/extern/libmv/files.txt
    branches/ge_harmony/extern/libmv/libmv/multiview/fundamental.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/tracks.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/tracks.h
    branches/ge_harmony/extern/libmv/third_party/gflags/README.libmv
    branches/ge_harmony/extern/libmv/third_party/glog/README.libmv
    branches/ge_harmony/intern/SConscript
    branches/ge_harmony/intern/audaspace/SConscript
    branches/ge_harmony/intern/bsp/SConscript
    branches/ge_harmony/intern/container/SConscript
    branches/ge_harmony/intern/cycles/SConscript
    branches/ge_harmony/intern/cycles/blender/addon/ui.py
    branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/SConscript
    branches/ge_harmony/intern/cycles/kernel/kernel_montecarlo.h
    branches/ge_harmony/intern/cycles/kernel/kernel_object.h
    branches/ge_harmony/intern/cycles/kernel/kernel_textures.h
    branches/ge_harmony/intern/cycles/kernel/kernel_triangle.h
    branches/ge_harmony/intern/cycles/kernel/kernel_types.h
    branches/ge_harmony/intern/cycles/kernel/osl/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/osl/SConscript
    branches/ge_harmony/intern/cycles/kernel/osl/osl_closures.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/osl_closures.h
    branches/ge_harmony/intern/cycles/kernel/osl/osl_shader.cpp
    branches/ge_harmony/intern/cycles/kernel/shaders/SConscript
    branches/ge_harmony/intern/cycles/kernel/shaders/node_geometry.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/stdosl.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_math.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
    branches/ge_harmony/intern/cycles/render/object.cpp
    branches/ge_harmony/intern/cycles/render/scene.h
    branches/ge_harmony/intern/cycles/util/util_math.h
    branches/ge_harmony/intern/dualcon/SConscript
    branches/ge_harmony/intern/elbeem/SConscript
    branches/ge_harmony/intern/ghost/SConscript
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/ge_harmony/intern/guardedalloc/SConscript
    branches/ge_harmony/intern/guardedalloc/intern/mallocn.c
    branches/ge_harmony/intern/iksolver/SConscript
    branches/ge_harmony/intern/itasc/SConscript
    branches/ge_harmony/intern/locale/SConscript
    branches/ge_harmony/intern/memutil/SConscript
    branches/ge_harmony/intern/mikktspace/SConscript
    branches/ge_harmony/intern/moto/SConscript
    branches/ge_harmony/intern/opencolorio/SConscript
    branches/ge_harmony/intern/opennl/SConscript
    branches/ge_harmony/intern/raskter/SConscript
    branches/ge_harmony/intern/smoke/SConscript
    branches/ge_harmony/intern/string/SConscript
    branches/ge_harmony/intern/utfconv/SConscript
    branches/ge_harmony/release/datafiles/blender_icons.sh
    branches/ge_harmony/release/datafiles/blender_icons.svg
    branches/ge_harmony/release/datafiles/fonts/droidsans.ttf.gz
    branches/ge_harmony/release/datafiles/startup.blend
    branches/ge_harmony/release/scripts/modules/addon_utils.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/bpy/utils.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_render.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
    branches/ge_harmony/release/scripts/templates/addon_add_object.py
    branches/ge_harmony/release/scripts/templates/operator_modal_draw.py
    branches/ge_harmony/release/scripts/templates/operator_modal_view3d_raycast.py
    branches/ge_harmony/source/SConscript
    branches/ge_harmony/source/blender/SConscript
    branches/ge_harmony/source/blender/avi/SConscript
    branches/ge_harmony/source/blender/blenfont/BLF_translation.h
    branches/ge_harmony/source/blender/blenfont/SConscript
    branches/ge_harmony/source/blender/blenfont/intern/blf_lang.c
    branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
    branches/ge_harmony/source/blender/blenkernel/BKE_context.h
    branches/ge_harmony/source/blender/blenkernel/BKE_library.h
    branches/ge_harmony/source/blender/blenkernel/BKE_main.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_object.h
    branches/ge_harmony/source/blender/blenkernel/BKE_property.h
    branches/ge_harmony/source/blender/blenkernel/SConscript
    branches/ge_harmony/source/blender/blenkernel/intern/blender.c
    branches/ge_harmony/source/blender/blenkernel/intern/bpath.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/dynamicpaint.c
    branches/ge_harmony/source/blender/blenkernel/intern/gpencil.c
    branches/ge_harmony/source/blender/blenkernel/intern/image.c
    branches/ge_harmony/source/blender/blenkernel/intern/key.c
    branches/ge_harmony/source/blender/blenkernel/intern/library.c
    branches/ge_harmony/source/blender/blenkernel/intern/material.c
    branches/ge_harmony/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/node.c
    branches/ge_harmony/source/blender/blenkernel/intern/object.c
    branches/ge_harmony/source/blender/blenkernel/intern/particle_system.c
    branches/ge_harmony/source/blender/blenkernel/intern/pbvh.c
    branches/ge_harmony/source/blender/blenkernel/intern/pointcache.c
    branches/ge_harmony/source/blender/blenkernel/intern/property.c
    branches/ge_harmony/source/blender/blenkernel/intern/report.c
    branches/ge_harmony/source/blender/blenkernel/intern/scene.c
    branches/ge_harmony/source/blender/blenkernel/intern/sequencer.c
    branches/ge_harmony/source/blender/blenkernel/intern/smoke.c
    branches/ge_harmony/source/blender/blenkernel/intern/softbody.c
    branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
    branches/ge_harmony/source/blender/blenlib/SConscript
    branches/ge_harmony/source/blender/blenloader/SConscript
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/bmesh/SConscript
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_construct.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_extrude.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_bevel.c
    branches/ge_harmony/source/blender/collada/SConscript
    branches/ge_harmony/source/blender/compositor/SConscript
    branches/ge_harmony/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/ge_harmony/source/blender/editors/SConscript
    branches/ge_harmony/source/blender/editors/animation/SConscript
    branches/ge_harmony/source/blender/editors/animation/anim_channels_edit.c
    branches/ge_harmony/source/blender/editors/armature/SConscript
    branches/ge_harmony/source/blender/editors/armature/editarmature.c
    branches/ge_harmony/source/blender/editors/curve/SConscript
    branches/ge_harmony/source/blender/editors/datafiles/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/datafiles/SConscript
    branches/ge_harmony/source/blender/editors/gpencil/SConscript
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_edit.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_paint.c
    branches/ge_harmony/source/blender/editors/include/ED_datafiles.h
    branches/ge_harmony/source/blender/editors/include/ED_gpencil.h
    branches/ge_harmony/source/blender/editors/include/ED_screen.h
    branches/ge_harmony/source/blender/editors/include/ED_sequencer.h
    branches/ge_harmony/source/blender/editors/include/UI_resources.h
    branches/ge_harmony/source/blender/editors/interface/SConscript
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
    branches/ge_harmony/source/blender/editors/interface/interface_icons.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_templates.c
    branches/ge_harmony/source/blender/editors/interface/interface_utils.c
    branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
    branches/ge_harmony/source/blender/editors/interface/resources.c
    branches/ge_harmony/source/blender/editors/interface/view2d.c
    branches/ge_harmony/source/blender/editors/io/SConscript
    branches/ge_harmony/source/blender/editors/mask/SConscript
    branches/ge_harmony/source/blender/editors/mask/mask_relationships.c
    branches/ge_harmony/source/blender/editors/mesh/SConscript
    branches/ge_harmony/source/blender/editors/mesh/editface.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_add.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_knife.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_loopcut.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_rip.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_select.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_utils.c
    branches/ge_harmony/source/blender/editors/mesh/mesh_data.c
    branches/ge_harmony/source/blender/editors/mesh/mesh_navmesh.c
    branches/ge_harmony/source/blender/editors/mesh/mesh_ops.c
    branches/ge_harmony/source/blender/editors/mesh/meshtools.c
    branches/ge_harmony/source/blender/editors/metaball/SConscript
    branches/ge_harmony/source/blender/editors/object/SConscript
    branches/ge_harmony/source/blender/editors/object/object_add.c
    branches/ge_harmony/source/blender/editors/object/object_bake.c
    branches/ge_harmony/source/blender/editors/object/object_edit.c
    branches/ge_harmony/source/blender/editors/object/object_transform.c
    branches/ge_harmony/source/blender/editors/object/object_vgroup.c
    branches/ge_harmony/source/blender/editors/physics/SConscript
    branches/ge_harmony/source/blender/editors/physics/physics_fluid.c
    branches/ge_harmony/source/blender/editors/render/SConscript
    branches/ge_harmony/source/blender/editors/render/render_update.c
    branches/ge_harmony/source/blender/editors/screen/SConscript
    branches/ge_harmony/source/blender/editors/screen/area.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/sculpt_paint/SConscript
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/ge_harmony/source/blender/editors/sound/SConscript
    branches/ge_harmony/source/blender/editors/space_action/SConscript
    branches/ge_harmony/source/blender/editors/space_api/SConscript
    branches/ge_harmony/source/blender/editors/space_buttons/SConscript
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_texture.c
    branches/ge_harmony/source/blender/editors/space_clip/SConscript
    branches/ge_harmony/source/blender/editors/space_clip/clip_buttons.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/space_clip.c
    branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
    branches/ge_harmony/source/blender/editors/space_console/SConscript
    branches/ge_harmony/source/blender/editors/space_console/space_console.c
    branches/ge_harmony/source/blender/editors/space_file/SConscript
    branches/ge_harmony/source/blender/editors/space_graph/SConscript
    branches/ge_harmony/source/blender/editors/space_image/SConscript
    branches/ge_harmony/source/blender/editors/space_image/image_buttons.c
    branches/ge_harmony/source/blender/editors/space_image/image_edit.c
    branches/ge_harmony/source/blender/editors/space_image/space_image.c
    branches/ge_harmony/source/blender/editors/space_info/SConscript
    branches/ge_harmony/source/blender/editors/space_info/info_report.c
    branches/ge_harmony/source/blender/editors/space_logic/SConscript
    branches/ge_harmony/source/blender/editors/space_nla/SConscript
    branches/ge_harmony/source/blender/editors/space_node/SConscript
    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/space_node.c
    branches/ge_harmony/source/blender/editors/space_outliner/SConscript
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_draw.c
    branches/ge_harmony/source/blender/editors/space_script/SConscript
    branches/ge_harmony/source/blender/editors/space_sequencer/SConscript
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_buttons.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_sequencer/space_sequencer.c
    branches/ge_harmony/source/blender/editors/space_text/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_text/SConscript
    branches/ge_harmony/source/blender/editors/space_text/space_text.c
    branches/ge_harmony/source/blender/editors/space_text/text_draw.c
    branches/ge_harmony/source/blender/editors/space_text/text_header.c
    branches/ge_harmony/source/blender/editors/space_text/text_intern.h
    branches/ge_harmony/source/blender/editors/space_text/text_ops.c
    branches/ge_harmony/source/blender/editors/space_text/text_python.c
    branches/ge_harmony/source/blender/editors/space_time/SConscript
    branches/ge_harmony/source/blender/editors/space_userpref/SConscript
    branches/ge_harmony/source/blender/editors/space_view3d/SConscript
    branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
    branches/ge_harmony/source/blender/editors/space_view3d/drawvolume.c
    branches/ge_harmony/source/blender/editors/space_view3d/space_view3d.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_buttons.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_draw.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_edit.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_fly.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_ops.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_project.c
    branches/ge_harmony/source/blender/editors/transform/SConscript
    branches/ge_harmony/source/blender/editors/transform/transform.c
    branches/ge_harmony/source/blender/editors/transform/transform_generics.c
    branches/ge_harmony/source/blender/editors/transform/transform_manipulator.c
    branches/ge_harmony/source/blender/editors/transform/transform_orientations.c
    branches/ge_harmony/source/blender/editors/util/SConscript
    branches/ge_harmony/source/blender/editors/uvedit/SConscript
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/ge_harmony/source/blender/gpu/SConscript
    branches/ge_harmony/source/blender/gpu/intern/gpu_buffers.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_draw.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
    branches/ge_harmony/source/blender/ikplugin/SConscript
    branches/ge_harmony/source/blender/imbuf/SConscript
    branches/ge_harmony/source/blender/imbuf/intern/allocimbuf.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/SConscript
    branches/ge_harmony/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/ge_harmony/source/blender/imbuf/intern/dds/FlipDXT.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/SConscript
    branches/ge_harmony/source/blender/imbuf/intern/openexr/SConscript
    branches/ge_harmony/source/blender/makesdna/DNA_customdata_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_userdef_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_view3d_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_windowmanager_types.h
    branches/ge_harmony/source/blender/makesdna/SConscript
    branches/ge_harmony/source/blender/makesdna/intern/SConscript
    branches/ge_harmony/source/blender/makesdna/intern/makesdna.c
    branches/ge_harmony/source/blender/makesrna/RNA_access.h
    branches/ge_harmony/source/blender/makesrna/RNA_types.h
    branches/ge_harmony/source/blender/makesrna/SConscript
    branches/ge_harmony/source/blender/makesrna/intern/SConscript
    branches/ge_harmony/source/blender/makesrna/intern/makesrna.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_nodetree.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_object.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_userdef.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm.c
    branches/ge_harmony/source/blender/modifiers/SConscript
    branches/ge_harmony/source/blender/modifiers/intern/MOD_uvwarp.c
    branches/ge_harmony/source/blender/nodes/SConscript
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/ge_harmony/source/blender/opencl/SConscript
    branches/ge_harmony/source/blender/python/SConscript
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_utils.c
    branches/ge_harmony/source/blender/python/intern/CMakeLists.txt
    branches/ge_harmony/source/blender/python/intern/bpy.c
    branches/ge_harmony/source/blender/python/intern/bpy_app.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna.h
    branches/ge_harmony/source/blender/python/intern/bpy_rna_callback.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna_callback.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.c
    branches/ge_harmony/source/blender/quicktime/SConscript
    branches/ge_harmony/source/blender/render/CMakeLists.txt
    branches/ge_harmony/source/blender/render/SConscript
    branches/ge_harmony/source/blender/render/intern/include/rayobject.h
    branches/ge_harmony/source/blender/render/intern/include/render_types.h
    branches/ge_harmony/source/blender/render/intern/include/rendercore.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject.cpp
    branches/ge_harmony/source/blender/render/intern/source/convertblender.c
    branches/ge_harmony/source/blender/render/intern/source/pipeline.c
    branches/ge_harmony/source/blender/render/intern/source/pointdensity.c
    branches/ge_harmony/source/blender/render/intern/source/rayshade.c
    branches/ge_harmony/source/blender/render/intern/source/rendercore.c
    branches/ge_harmony/source/blender/windowmanager/SConscript
    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_operators.c
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/SConscript
    branches/ge_harmony/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/SConscript
    branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.h
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/ge_harmony/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/ge_harmony/source/gameengine/Converter/SConscript
    branches/ge_harmony/source/gameengine/Expressions/SConscript
    branches/ge_harmony/source/gameengine/GameLogic/CMakeLists.txt
    branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SConscript
    branches/ge_harmony/source/gameengine/GamePlayer/SConscript
    branches/ge_harmony/source/gameengine/GamePlayer/common/SConscript
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/SConscript
    branches/ge_harmony/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_Material.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_Material.h
    branches/ge_harmony/source/gameengine/Ketsji/BL_Texture.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/ge_harmony/source/gameengine/Ketsji/SConscript
    branches/ge_harmony/source/gameengine/Network/LoopBackNetwork/SConscript
    branches/ge_harmony/source/gameengine/Network/SConscript
    branches/ge_harmony/source/gameengine/Physics/Bullet/SConscript
    branches/ge_harmony/source/gameengine/Physics/Dummy/SConscript
    branches/ge_harmony/source/gameengine/Physics/common/SConscript
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_texmatrix.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/SConscript
    branches/ge_harmony/source/gameengine/SConscript
    branches/ge_harmony/source/gameengine/SceneGraph/SConscript
    branches/ge_harmony/source/gameengine/VideoTexture/SConscript
    branches/ge_harmony/source/icons/SConscript
    branches/ge_harmony/source/tests/bl_load_addons.py

Added Paths:
-----------
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_toon.h
    branches/ge_harmony/intern/cycles/kernel/osl/bsdf_toon.cpp
    branches/ge_harmony/release/datafiles/blender_icons16.png
    branches/ge_harmony/release/datafiles/blender_icons32.png
    branches/ge_harmony/release/scripts/modules/bpy_restrict_state.py
    branches/ge_harmony/source/blender/editors/space_text/text_format.c
    branches/ge_harmony/source/blender/editors/space_text/text_format.h
    branches/ge_harmony/source/blender/editors/space_text/text_format_py.c
    branches/ge_harmony/source/blender/python/intern/bpy_app_build_options.c
    branches/ge_harmony/source/blender/python/intern/bpy_app_build_options.h
    branches/ge_harmony/source/blender/render/extern/include/RE_multires_bake.h
    branches/ge_harmony/source/blender/render/intern/source/multires_bake.c
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonJoystick.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonJoystick.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h

Removed Paths:
-------------
    branches/ge_harmony/intern/boolop/
    branches/ge_harmony/release/datafiles/blender_icons.png
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h

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,49292,49294,49466,49894,50052,50126
/trunk/blender:48067-53052
   + /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:48067-53224

Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct	2012-12-21 07:28:14 UTC (rev 53235)
+++ branches/ge_harmony/SConstruct	2012-12-21 08:35:26 UTC (rev 53236)
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # The Original Code is Copyright (C) 2006, Blender Foundation
 # All rights reserved.
@@ -536,7 +536,8 @@
 data_to_c_simple("release/datafiles/bmonofont.ttf")
 
 data_to_c_simple("release/datafiles/splash.png")
-data_to_c_simple("release/datafiles/blender_icons.png")
+data_to_c_simple("release/datafiles/blender_icons16.png")
+data_to_c_simple("release/datafiles/blender_icons32.png")
 data_to_c_simple("release/datafiles/prvicons.png")
 
 data_to_c_simple("release/datafiles/brushicons/add.png")

Modified: branches/ge_harmony/build_files/build_environment/install_deps.sh
===================================================================
--- branches/ge_harmony/build_files/build_environment/install_deps.sh	2012-12-21 07:28:14 UTC (rev 53235)
+++ branches/ge_harmony/build_files/build_environment/install_deps.sh	2012-12-21 08:35:26 UTC (rev 53236)
@@ -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/ge_harmony/build_files/scons/config/linux-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/linux-config.py	2012-12-21 07:28:14 UTC (rev 53235)
+++ branches/ge_harmony/build_files/scons/config/linux-config.py	2012-12-21 08:35:26 UTC (rev 53236)
@@ -197,7 +197,7 @@
 WITH_BF_STATICBOOST = False
 BF_BOOST = '/usr'
 BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
+BF_BOOST_LIB = 'boost_filesystem boost_regex boost_system boost_thread boost_date_time'
 BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
     '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a' + \
     '${BF_BOOST_LIBPATH}/libboost_thread.a'

Modified: branches/ge_harmony/build_files/scons/tools/btools.py
===================================================================
--- branches/ge_harmony/build_files/scons/tools/btools.py	2012-12-21 07:28:14 UTC (rev 53235)
+++ branches/ge_harmony/build_files/scons/tools/btools.py	2012-12-21 08:35:26 UTC (rev 53236)
@@ -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/ge_harmony/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/ge_harmony/doc/python_api/rst/bge.logic.rst	2012-12-21 07:28:14 UTC (rev 53235)
+++ branches/ge_harmony/doc/python_api/rst/bge.logic.rst	2012-12-21 08:35:26 UTC (rev 53236)
@@ -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.
+
 *****************
 General functions
 *****************

Modified: branches/ge_harmony/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/ge_harmony/doc/python_api/rst/bge.types.rst	2012-12-21 07:28:14 UTC (rev 53235)
+++ branches/ge_harmony/doc/python_api/rst/bge.types.rst	2012-12-21 08:35:26 UTC (rev 53236)
@@ -141,6 +141,74 @@
       
       :type: boolean
 
+.. class:: SCA_PythonJoystick(PyObjectPlus)
+
+   A Python interface to a joystick.
+
+   .. attribute:: name
+
+      The name assigned to the joystick by the operating system. (read-only)
+	  
+      :type: string
+
+   .. attribute:: activeButtons
+
+      A list of active button values. (read-only)
+	  
+      :type: list
+
+   .. attribute:: axisValues
+
+      The state of the joysticks axis as a list of values :data:`numAxis` long. (read-only).
+
+      :type: list of ints.
+
+      Each specifying the value of an axis between -1.0 and 1.0 depending on how far the axis is pushed, 0 for nothing.
+      The first 2 values are used by most joysticks and gamepads for directional control. 3rd and 4th values are only on some joysticks and can be used for arbitary controls.
+
+      * left:[-1.0, 0.0, ...]
+      * right:[1.0, 0.0, ...]
+      * up:[0.0, -1.0, ...]
+      * down:[0.0, 1.0, ...]
+
+   .. attribute:: hatValues
+
+      The state of the joysticks hats as a list of values :data:`numHats` long. (read-only).
+
+      :type: list of ints
+
+      Each specifying the direction of the hat from 1 to 12, 0 when inactive.
+
+      Hat directions are as follows...
+
+      * 0:None
+      * 1:Up
+      * 2:Right
+      * 4:Down
+      * 8:Left
+      * 3:Up - Right
+      * 6:Down - Right
+      * 12:Down - Left
+      * 9:Up - Left
+
+   .. attribute:: numAxis
+
+      The number of axes for the joystick at this index. (read-only).
+
+      :type: integer
+
+   .. attribute:: numButtons
+
+      The number of buttons for the joystick at this index. (read-only).
+
+      :type: integer
+
+   .. attribute:: numHats
+
+      The number of hats for the joystick at this index. (read-only).
+
+      :type: integer
+
 .. class:: SCA_IObject(CValue)
 
    This class has no python functions
@@ -4034,7 +4102,7 @@
 
       :type: list of ints.
 
-      Each spesifying the value of an axis between -32767 and 32767 depending on how far the axis is pushed, 0 for nothing.
+      Each specifying the value of an axis between -32767 and 32767 depending on how far the axis is pushed, 0 for nothing.
       The first 2 values are used by most joysticks and gamepads for directional control. 3rd and 4th values are only on some joysticks and can be used for arbitary controls.
 
       * left:[-32767, 0, ...]
@@ -4058,7 +4126,7 @@
 
       :type: list of ints
 
-      Each spesifying the direction of the hat from 1 to 12, 0 when inactive.
+      Each specifying the direction of the hat from 1 to 12, 0 when inactive.
 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list