[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40822] branches/soc-2011-cucumber: svn merge -r40631:40820(HEAD) https://svn.blender.org/svnroot/bf-blender/ trunk/blenderk
Dalai Felinto
dfelinto at gmail.com
Thu Oct 6 06:40:18 CEST 2011
Revision: 40822
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40822
Author: dfelinto
Date: 2011-10-06 04:40:18 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
svn merge -r40631:40820(HEAD) https://svn.blender.org/svnroot/bf-blender/trunk/blenderk
40790 manually merged.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40631
Modified Paths:
--------------
branches/soc-2011-cucumber/CMakeLists.txt
branches/soc-2011-cucumber/GNUmakefile
branches/soc-2011-cucumber/SConstruct
branches/soc-2011-cucumber/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-cucumber/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-cucumber/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-cucumber/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-cucumber/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-cucumber/build_files/cmake/config/blender_headless.cmake
branches/soc-2011-cucumber/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-cucumber/build_files/cmake/config/bpy_module.cmake
branches/soc-2011-cucumber/build_files/cmake/macros.cmake
branches/soc-2011-cucumber/build_files/package_spec/debian/control
branches/soc-2011-cucumber/build_files/package_spec/pacman/PKGBUILD
branches/soc-2011-cucumber/build_files/scons/config/darwin-config.py
branches/soc-2011-cucumber/build_files/scons/config/freebsd7-config.py
branches/soc-2011-cucumber/build_files/scons/config/freebsd8-config.py
branches/soc-2011-cucumber/build_files/scons/config/freebsd9-config.py
branches/soc-2011-cucumber/build_files/scons/config/linux-config.py
branches/soc-2011-cucumber/build_files/scons/config/linuxcross-config.py
branches/soc-2011-cucumber/build_files/scons/config/openbsd3-config.py
branches/soc-2011-cucumber/build_files/scons/config/sunos5-config.py
branches/soc-2011-cucumber/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-cucumber/build_files/scons/config/win32-vc-config.py
branches/soc-2011-cucumber/build_files/scons/config/win64-vc-config.py
branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
branches/soc-2011-cucumber/build_files/scons/tools/btools.py
branches/soc-2011-cucumber/doc/python_api/examples/aud.py
branches/soc-2011-cucumber/doc/python_api/rst/change_log.rst
branches/soc-2011-cucumber/doc/python_api/sphinx_changelog_gen.py
branches/soc-2011-cucumber/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-cucumber/extern/recastnavigation/CMakeLists.txt
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Include/Recast.h
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/Recast.cpp
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastContour.cpp
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastFilter.cpp
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastMesh.cpp
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastRegion.cpp
branches/soc-2011-cucumber/extern/recastnavigation/recast-capi.cpp
branches/soc-2011-cucumber/extern/recastnavigation/recast-capi.h
branches/soc-2011-cucumber/intern/audaspace/CMakeLists.txt
branches/soc-2011-cucumber/intern/audaspace/SConscript
branches/soc-2011-cucumber/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2011-cucumber/intern/elbeem/intern/ntl_world.cpp
branches/soc-2011-cucumber/intern/ghost/SConscript
branches/soc-2011-cucumber/po/POTFILES.in
branches/soc-2011-cucumber/po/ar.po
branches/soc-2011-cucumber/po/bg.po
branches/soc-2011-cucumber/po/ca.po
branches/soc-2011-cucumber/po/cs.po
branches/soc-2011-cucumber/po/de.po
branches/soc-2011-cucumber/po/el.po
branches/soc-2011-cucumber/po/es.po
branches/soc-2011-cucumber/po/fi.po
branches/soc-2011-cucumber/po/fr.po
branches/soc-2011-cucumber/po/hr.po
branches/soc-2011-cucumber/po/it.po
branches/soc-2011-cucumber/po/ja.po
branches/soc-2011-cucumber/po/ko.po
branches/soc-2011-cucumber/po/ne.po
branches/soc-2011-cucumber/po/nl.po
branches/soc-2011-cucumber/po/pl.po
branches/soc-2011-cucumber/po/pt_BR.po
branches/soc-2011-cucumber/po/ro.po
branches/soc-2011-cucumber/po/ru.po
branches/soc-2011-cucumber/po/sr.po
branches/soc-2011-cucumber/po/sr at Latn.po
branches/soc-2011-cucumber/po/sv.po
branches/soc-2011-cucumber/po/uk.po
branches/soc-2011-cucumber/po/update_mo.py
branches/soc-2011-cucumber/po/update_msg.py
branches/soc-2011-cucumber/po/update_po.py
branches/soc-2011-cucumber/po/update_pot.py
branches/soc-2011-cucumber/po/zh_CN.po
branches/soc-2011-cucumber/po/zh_TW.po
branches/soc-2011-cucumber/release/bin/.blender/fonts/droidsans.ttf.gz
branches/soc-2011-cucumber/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/ne/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/bin/.blender/locale/zh_TW/LC_MESSAGES/blender.mo
branches/soc-2011-cucumber/release/scripts/modules/bpy/ops.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-cucumber/release/text/readme.html
branches/soc-2011-cucumber/source/blender/avi/intern/avirgb.c
branches/soc-2011-cucumber/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_material.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_object.h
branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/boids.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/collision.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/curve.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/displist.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/idcode.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/implicit.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/material.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/multires.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/object.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/scene.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/text.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/texture.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_args.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_dynstr.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/bpath.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/math_base.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/path_util.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/storage.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/string.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/threads.c
branches/soc-2011-cucumber/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
branches/soc-2011-cucumber/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-cucumber/source/blender/collada/AnimationImporter.h
branches/soc-2011-cucumber/source/blender/editors/animation/anim_filter.c
branches/soc-2011-cucumber/source/blender/editors/animation/keyframes_edit.c
branches/soc-2011-cucumber/source/blender/editors/curve/editcurve.c
branches/soc-2011-cucumber/source/blender/editors/include/UI_interface.h
branches/soc-2011-cucumber/source/blender/editors/interface/interface.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_draw.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_icons.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_intern.h
branches/soc-2011-cucumber/source/blender/editors/interface/interface_layout.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_ops.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_regions.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_templates.c
branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-cucumber/source/blender/editors/object/object_bake.c
branches/soc-2011-cucumber/source/blender/editors/object/object_edit.c
branches/soc-2011-cucumber/source/blender/editors/object/object_relations.c
branches/soc-2011-cucumber/source/blender/editors/object/object_vgroup.c
branches/soc-2011-cucumber/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-cucumber/source/blender/editors/render/render_preview.c
branches/soc-2011-cucumber/source/blender/editors/screen/area.c
branches/soc-2011-cucumber/source/blender/editors/screen/glutil.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-cucumber/source/blender/editors/space_action/action_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-cucumber/source/blender/editors/space_file/file_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_file/file_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_file/filelist.c
branches/soc-2011-cucumber/source/blender/editors/space_file/filesel.c
branches/soc-2011-cucumber/source/blender/editors/space_file/space_file.c
branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-cucumber/source/blender/editors/space_node/drawnode.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_generics.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_input.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_snap.c
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/bmp.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/imageprocess.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/jpeg.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/targa.c
branches/soc-2011-cucumber/source/blender/makesdna/DNA_ID.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-cucumber/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/makesrna/RNA_access.h
branches/soc-2011-cucumber/source/blender/makesrna/RNA_define.h
branches/soc-2011-cucumber/source/blender/makesrna/RNA_types.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_boid.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_key.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_meta.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_text.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-cucumber/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_driver.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_operator.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_props.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.h
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils.c
branches/soc-2011-cucumber/source/blender/quicktime/SConscript
branches/soc-2011-cucumber/source/blender/render/intern/include/render_types.h
branches/soc-2011-cucumber/source/blender/render/intern/source/convertblender.c
branches/soc-2011-cucumber/source/blender/render/intern/source/render_texture.c
branches/soc-2011-cucumber/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-cucumber/source/blender/windowmanager/WM_types.h
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-cucumber/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-cucumber/source/creator/CMakeLists.txt
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/soc-2011-cucumber/source/tools/MakeGLStipple.py
Added Paths:
-----------
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Include/RecastAlloc.h
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Include/RecastAssert.h
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastAlloc.cpp
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastArea.cpp
branches/soc-2011-cucumber/extern/recastnavigation/Recast/Source/RecastLayers.cpp
branches/soc-2011-cucumber/po/README.txt
branches/soc-2011-cucumber/po/check_po.py
branches/soc-2011-cucumber/po/clean_po.py
branches/soc-2011-cucumber/po/merge_po.py
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_camera_api.c
branches/soc-2011-cucumber/source/tools/compile_scripts.py
Removed Paths:
-------------
branches/soc-2011-cucumber/build_files/cmake/Modules/FindSamplerate.cmake
branches/soc-2011-cucumber/doc/python_api/blender_api_40524.py
branches/soc-2011-cucumber/po/blender.pot
branches/soc-2011-cucumber/po/messages.txt
branches/soc-2011-cucumber/release/bin/.blender/.Blanguages
Property Changed:
----------------
branches/soc-2011-cucumber/
branches/soc-2011-cucumber/po/ne.po
branches/soc-2011-cucumber/release/bin/.blender/fonts/droidsans.ttf.gz
branches/soc-2011-cucumber/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36829-40545
+ /trunk/blender:36829-40545,40632-40820
Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt 2011-10-06 04:33:00 UTC (rev 40821)
+++ branches/soc-2011-cucumber/CMakeLists.txt 2011-10-06 04:40:18 UTC (rev 40822)
@@ -26,8 +26,8 @@
# ***** END GPL LICENSE BLOCK *****
#-----------------------------------------------------------------------------
-# We don't allow in-source builds. This causes no end of troubles because
-# all out-of-source builds will use the CMakeCache.txt file there and even
+# We don't allow in-source builds. This causes no end of troubles because
+# all out-of-source builds will use the CMakeCache.txt file there and even
# build the libs and objects in it.
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
@@ -189,7 +189,6 @@
option(WITH_SDL "Enable SDL for sound and joystick support" ON)
option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
option(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
-option(WITH_SAMPLERATE "Enable samplerate conversion" ON)
# Compression
option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
@@ -197,7 +196,7 @@
# 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)
+option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
endif()
@@ -273,7 +272,7 @@
set(WITH_HEADLESS ON)
endif()
-TEST_SSE_SUPPORT()
+TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
# don't store paths to libs for portable distrobution
if(WITH_INSTALL_PORTABLE)
@@ -286,8 +285,8 @@
# linux only, not cached
set(WITH_BINRELOC OFF)
-# MAXOSX only, set to avoid uninitialized
-set(EXETYPE)
+# MAXOSX only, set to avoid uninitialized
+set(EXETYPE "")
# C/C++ flags
set(PLATFORM_CFLAGS)
@@ -298,26 +297,26 @@
# libraries to link the binary with passed to target_link_libraries()
# known as LLIBS to scons
-set(PLATFORM_LINKLIBS)
+set(PLATFORM_LINKLIBS "")
# Added to linker flags in setup_liblinks
# - CMAKE_EXE_LINKER_FLAGS
# - CMAKE_EXE_LINKER_FLAGS_DEBUG
-set(PLATFORM_LINKFLAGS)
-set(PLATFORM_LINKFLAGS_DEBUG)
+set(PLATFORM_LINKFLAGS "")
+set(PLATFORM_LINKFLAGS_DEBUG "")
# disabled for now, not supported
# option(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
-# On Unix:
+# On Unix:
# cmake ../blender \
# -D PYTHON_VERSION=3.2 \
# -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
# -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
#
-# On Macs:
+# On Macs:
# cmake ../blender \
# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \
@@ -329,7 +328,7 @@
#Platform specifics
if(UNIX AND NOT APPLE)
-
+
# needed for ubuntu 11.04
if(EXISTS "/usr/lib/x86_64-linux-gnu")
set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
@@ -381,10 +380,12 @@
if(WITH_SDL)
find_package(SDL)
- mark_as_advanced(SDLMAIN_LIBRARY)
- mark_as_advanced(SDL_INCLUDE_DIR)
- mark_as_advanced(SDL_LIBRARY)
- mark_as_advanced(SDL_LIBRARY_TEMP)
+ mark_as_advanced(
+ SDLMAIN_LIBRARY
+ SDL_INCLUDE_DIR
+ SDL_LIBRARY
+ SDL_LIBRARY_TEMP
+ )
# unset(SDLMAIN_LIBRARY CACHE)
if(NOT SDL_FOUND)
set(WITH_SDL OFF)
@@ -428,11 +429,13 @@
PATHS
/sw/lib
)
- mark_as_advanced(ICONV_LIBRARY)
- mark_as_advanced(INTL_LIBRARY)
+ mark_as_advanced(
+ ICONV_LIBRARY
+ INTL_LIBRARY
+ )
if(INTL_LIBRARY AND ICONV_LIBRARY)
- set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+ set(GETTEXT_LIBRARIES ${INTL_LIBRARY} ${ICONV_LIBRARY})
endif()
endif()
@@ -443,13 +446,6 @@
endif()
endif()
- if(WITH_SAMPLERATE)
- find_package(Samplerate)
- if(NOT SAMPLERATE_FOUND)
- set(WITH_SAMPLERATE OFF)
- endif()
- endif()
-
if(WITH_OPENCOLLADA)
find_package(OpenCOLLADA)
if(OPENCOLLADA_FOUND)
@@ -488,17 +484,17 @@
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
- list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}")
if(WITH_X11_XINPUT)
- list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE)
# BSD's dont use libdl.so
- list(APPEND PLATFORM_LINKLIBS -ldl)
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
@@ -519,16 +515,16 @@
# Intel C++ Compiler
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
# think these next two are broken
- find_program(XIAR xiar)
- if(XIAR)
+ find_program(XIAR xiar)
+ if(XIAR)
set(CMAKE_AR "${XIAR}")
- endif()
+ endif()
mark_as_advanced(XIAR)
- find_program(XILD xild)
- if(XILD)
+ find_program(XILD xild)
+ if(XILD)
set(CMAKE_LINKER "${XILD}")
- endif()
+ endif()
mark_as_advanced(XILD)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise -prec_div -parallel")
@@ -551,7 +547,7 @@
message("64 bit compiler detected.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
endif()
-
+
add_definitions(-DWIN32)
if(WITH_INTERNATIONAL)
@@ -561,13 +557,6 @@
set(ICONV_LIBPATH ${ICONV}/lib)
endif()
- if(WITH_SAMPLERATE)
- set(SAMPLERATE ${LIBDIR}/samplerate)
- set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
- set(SAMPLERATE_LIBRARIES libsamplerate)
- set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
- endif()
-
set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIR "${PNG}/include")
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
@@ -576,7 +565,7 @@
set(JPEG_INCLUDE_DIR "${JPEG}/include")
set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
- set(WINTAB_INC ${LIBDIR}/wintab/include)
+ set(WINTAB_INC ${LIBDIR}/wintab/include)
if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal)
@@ -641,9 +630,9 @@
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gettext)
- set(GETTEXT_INC ${GETTEXT}/include)
+ set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- set(GETTEXT_LIB gnu_gettext)
+ set(GETTEXT_LIBRARIES gnu_gettext)
endif()
if(CMAKE_CL_64)
@@ -684,7 +673,7 @@
${LIBDIR}/opencollada/include/COLLADABaseUtils/include
${LIBDIR}/opencollada/include/COLLADAFramework/include
${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
- ${LIBDIR}/opencollada/include/GeneratedSaxParser/include
+ ${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
set(OPENCOLLADA_LIBRARIES
@@ -741,7 +730,7 @@
set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
set(OPENEXR_INCLUDE_DIRS
${OPENEXR_INCUDE}
- ${OPENEXR_INCUDE}/IlmImf
+ ${OPENEXR_INCUDE}/IlmImf
${OPENEXR_INCUDE}/Iex
${OPENEXR_INCUDE}/Imath
)
@@ -800,9 +789,9 @@
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gcc/gettext)
- set(GETTEXT_INC ${GETTEXT}/include)
+ set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- set(GETTEXT_LIB intl)
+ set(GETTEXT_LIBRARIES intl)
endif()
set(JPEG_LIBRARIES libjpeg)
@@ -817,7 +806,7 @@
set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
set(PTHREADS_LIBPATH ${PTHREADS}/lib)
set(PTHREADS_LIBRARIES pthreadGC2)
-
+
set(FREETYPE ${LIBDIR}/gcc/freetype)
set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
set(FREETYPE_LIBPATH ${FREETYPE}/lib)
@@ -837,13 +826,13 @@
${LIBDIR}/gcc/opencollada/include/COLLADABaseUtils/include
${LIBDIR}/gcc/opencollada/include/COLLADAFramework/include
${LIBDIR}/gcc/opencollada/include/COLLADASaxFrameworkLoader/include
- ${LIBDIR}/gcc/opencollada/include/GeneratedSaxParser/include
+ ${LIBDIR}/gcc/opencollada/include/GeneratedSaxParser/include
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
set(PCRE_LIBRARIES pcre)
endif()
-
+
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
@@ -870,7 +859,7 @@
set(JACK_INCLUDE_DIRS ${JACK}/include/jack ${JACK}/include)
set(JACK_LIBRARIES jack)
set(JACK_LIBPATH ${JACK}/lib)
-
+
# TODO, gives linking errors, force off
set(WITH_JACK OFF)
endif()
@@ -908,8 +897,8 @@
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.0.0-powerpc)
endif()
endif()
-
+
if(WITH_OPENAL)
find_package(OpenAL)
if(OPENAL_FOUND)
@@ -952,8 +941,8 @@
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gettext)
- set(GETTEXT_INC "${GETTEXT}/include")
- set(GETTEXT_LIB intl iconv)
+ set(GETTEXT_INCLUDE_DIRS "${GETTEXT}/include")
+ set(GETTEXT_LIBRARIES intl iconv)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
endif()
@@ -991,16 +980,9 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
endif()
- if(WITH_SAMPLERATE)
- set(SAMPLERATE ${LIBDIR}/samplerate)
- set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
- set(SAMPLERATE_LIBRARIES samplerate)
- set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
- endif()
-
- find_library(SYSTEMSTUBS_LIBRARY
- NAMES
- SystemStubs
+ find_library(SYSTEMSTUBS_LIBRARY
+ NAMES
+ SystemStubs
PATHS
)
mark_as_advanced(SYSTEMSTUBS_LIBRARY)
@@ -1018,13 +1000,13 @@
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list