[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40242] branches/soc-2011-tomato: Merging trunk into soc-2011-tomato up to revision 40241

Sergey Sharybin g.ulairi at gmail.com
Thu Sep 15 20:59:31 CEST 2011 

Revision: 40242
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40242
Author:   nazgul
Date:     2011-09-15 18:59:30 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Merging trunk into soc-2011-tomato up to revision 40241

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40241

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/SConstruct
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/soc-2011-tomato/build_files/cmake/Modules/FindPCRE.cmake
    branches/soc-2011-tomato/build_files/cmake/Modules/FindXML2.cmake
    branches/soc-2011-tomato/build_files/cmake/macros.cmake
    branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-tomato/doc/python_api/examples/bpy.types.ID.user_clear.1.py
    branches/soc-2011-tomato/doc/python_api/rst/info_gotcha.rst
    branches/soc-2011-tomato/doc/python_api/rst/info_quickstart.rst
    branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2011-tomato/extern/CMakeLists.txt
    branches/soc-2011-tomato/extern/SConscript
    branches/soc-2011-tomato/extern/eltopo/common/bfstream.h
    branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleReader.cpp
    branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.cpp
    branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.h
    branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/soc-2011-tomato/intern/elbeem/CMakeLists.txt
    branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
    branches/soc-2011-tomato/release/scripts/modules/rna_info.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_util.c
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_material.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_paint.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenkernel/SConscript
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sca.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sketch.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_inline.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_string.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/graph.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/string.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/EffectExporter.h
    branches/soc-2011-tomato/source/blender/collada/ErrorHandler.cpp
    branches/soc-2011-tomato/source/blender/collada/SceneExporter.cpp
    branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
    branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
    branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
    branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
    branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-tomato/source/blender/editors/include/ED_armature.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_curve.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_sculpt.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-tomato/source/blender/editors/interface/resources.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-tomato/source/blender/editors/object/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/object/SConscript
    branches/soc-2011-tomato/source/blender/editors/object/object_add.c
    branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
    branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
    branches/soc-2011-tomato/source/blender/editors/object/object_intern.h
    branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
    branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
    branches/soc-2011-tomato/source/blender/editors/object/object_select.c
    branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
    branches/soc-2011-tomato/source/blender/editors/screen/area.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_context.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_stats.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_select.c
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-tomato/source/blender/editors/util/SConscript
    branches/soc-2011-tomato/source/blender/gpu/GPU_extensions.h
    branches/soc-2011-tomato/source/blender/gpu/GPU_material.h
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_key.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_property.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_text.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2011-tomato/source/blender/modifiers/SConscript
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/soc-2011-tomato/source/blender/python/SConscript
    branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.h
    branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/render/extern/include/RE_render_ext.h
    branches/soc-2011-tomato/source/blender/render/intern/include/pixelshading.h
    branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
    branches/soc-2011-tomato/source/blender/render/intern/include/rendercore.h
    branches/soc-2011-tomato/source/blender/render/intern/include/renderdatabase.h
    branches/soc-2011-tomato/source/blender/render/intern/include/shadbuf.h
    branches/soc-2011-tomato/source/blender/render/intern/include/shading.h
    branches/soc-2011-tomato/source/blender/render/intern/include/texture.h
    branches/soc-2011-tomato/source/blender/render/intern/include/volumetric.h
    branches/soc-2011-tomato/source/blender/render/intern/include/zbuf.h
    branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
    branches/soc-2011-tomato/source/blender/render/intern/source/occlusion.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-tomato/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-tomato/source/blender/render/intern/source/sss.c
    branches/soc-2011-tomato/source/blender/render/intern/source/volume_precache.c
    branches/soc-2011-tomato/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-tomato/source/creator/CMakeLists.txt
    branches/soc-2011-tomato/source/creator/creator.c
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/SConscript
    branches/soc-2011-tomato/source/gameengine/Expressions/IfExpr.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/SConscript
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2011-tomato/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/soc-2011-tomato/doc/python_api/rst/gpu.rst
    branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst
    branches/soc-2011-tomato/extern/recastnavigation/
    branches/soc-2011-tomato/extern/recastnavigation/CMakeLists.txt
    branches/soc-2011-tomato/extern/recastnavigation/Detour/
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourCommon.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourNode.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourTileNavMeshBuilder.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourCommon.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourNode.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourTileNavMesh.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourTileNavMeshBuilder.cpp
    branches/soc-2011-tomato/extern/recastnavigation/License.txt
    branches/soc-2011-tomato/extern/recastnavigation/Readme.txt
    branches/soc-2011-tomato/extern/recastnavigation/Recast/
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Include/
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Include/Recast.h
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Include/RecastLog.h
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Include/RecastTimer.h
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/Recast.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastContour.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastFilter.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastLog.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastRegion.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastTimer.cpp
    branches/soc-2011-tomato/extern/recastnavigation/SConscript
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/navmesh_conversion.cpp
    branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2011-tomato/source/blender/editors/object/object_navmesh.cpp
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_navmesh.cpp
    branches/soc-2011-tomato/source/blender/python/intern/gpu.c
    branches/soc-2011-tomato/source/blender/python/intern/gpu.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_NavMeshObject.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SteeringActuator.h

Removed Paths:
-------------
    branches/soc-2011-tomato/extern/recastnavigation/CMakeLists.txt
    branches/soc-2011-tomato/extern/recastnavigation/Detour/
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourCommon.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourNode.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Include/DetourTileNavMeshBuilder.h
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourCommon.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourNode.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourTileNavMesh.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Detour/Source/DetourTileNavMeshBuilder.cpp
    branches/soc-2011-tomato/extern/recastnavigation/License.txt
    branches/soc-2011-tomato/extern/recastnavigation/Readme.txt
    branches/soc-2011-tomato/extern/recastnavigation/Recast/
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Include/
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Include/Recast.h
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Include/RecastLog.h
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Include/RecastTimer.h
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/Recast.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastContour.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastFilter.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastLog.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastRegion.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastTimer.cpp
    branches/soc-2011-tomato/extern/recastnavigation/SConscript

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40043
   + /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40241

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2011-09-15 17:55:55 UTC (rev 40241)
+++ branches/soc-2011-tomato/CMakeLists.txt	2011-09-15 18:59:30 UTC (rev 40242)
@@ -645,11 +645,7 @@
 			set(GETTEXT ${LIBDIR}/gettext)
 			set(GETTEXT_INC ${GETTEXT}/include)
 			set(GETTEXT_LIBPATH ${GETTEXT}/lib)
-			if(CMAKE_CL_64)
-				set(GETTEXT_LIB gettext)
-			else()
-				set(GETTEXT_LIB gnu_gettext)
-			endif()
+			set(GETTEXT_LIB gnu_gettext)
 		endif()
 
 		if(CMAKE_CL_64)
@@ -705,7 +701,7 @@
 				${LIBDIR}/opencollada/lib/ftoa.lib
 				${LIBDIR}/opencollada/lib/UTF.lib
 			)
-			set(PCRE_LIB
+			set(PCRE_LIBRARIES
 				${LIBDIR}/opencollada/lib/pcre.lib
 			)
 		endif()
@@ -847,7 +843,7 @@
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
-			set(PCRE_LIB pcre)
+			set(PCRE_LIBRARIES pcre)
 		endif()
 		
 		if(WITH_CODEC_FFMPEG)
@@ -1069,7 +1065,7 @@
 		#pcre is bundled with openCollada
 		#set(PCRE ${LIBDIR}/pcre)
 		#set(PCRE_LIBPATH ${PCRE}/lib)
-		set(PCRE_LIB pcre)
+		set(PCRE_LIBRARIES pcre)
 		#libxml2 is used
 		#set(EXPAT ${LIBDIR}/expat)
 		#set(EXPAT_LIBPATH ${EXPAT}/lib)

Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct	2011-09-15 17:55:55 UTC (rev 40241)
+++ branches/soc-2011-tomato/SConstruct	2011-09-15 18:59:30 UTC (rev 40242)
@@ -645,7 +645,7 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
     dllsources = []
 
-    if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):
+    if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
         # For MinGW and linuxcross static linking will be used
         dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
 

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py	2011-09-15 17:55:55 UTC (rev 40241)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py	2011-09-15 18:59:30 UTC (rev 40242)
@@ -87,6 +87,10 @@
 BF_3DMOUSE = '/home/sources/staticlibs/spnav'
 BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
 
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CFLAGS = ['-O2']

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py	2011-09-15 17:55:55 UTC (rev 40241)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py	2011-09-15 18:59:30 UTC (rev 40242)
@@ -87,6 +87,10 @@
 BF_3DMOUSE = '/home/sources/staticlibs/spnav'
 BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
 
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CFLAGS = ['-O2']

Modified: branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-09-15 17:55:55 UTC (rev 40241)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-09-15 18:59:30 UTC (rev 40242)
@@ -119,8 +119,8 @@
       # Ubuntu ppa needs this.
       lib64/opencollada lib/opencollada
     )
+  MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
   IF(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
-    MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
     LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
   ENDIF()
 ENDFOREACH()

Modified: branches/soc-2011-tomato/build_files/cmake/Modules/FindPCRE.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindPCRE.cmake	2011-09-15 17:55:55 UTC (rev 40241)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindPCRE.cmake	2011-09-15 18:59:30 UTC (rev 40242)
@@ -1,43 +1,69 @@
-# - Try to find the PCRE regular expression library
-# Once done this will define
+# - Find PCRE library
+# Find the native PCRE includes and library
+# This module defines
+#  PCRE_INCLUDE_DIRS, where to find pcre.h, Set when
+#                     PCRE_INCLUDE_DIR is found.
+#  PCRE_LIBRARIES, libraries to link against to use PCRE.
+#  PCRE_ROOT_DIR, The base directory to search for PCRE.
+#                 This can also be an environment variable.
+#  PCRE_FOUND, If false, do not try to use PCRE.
 #
-#  PCRE_FOUND - system has the PCRE library
-#  PCRE_INCLUDE_DIR - the PCRE include directory
-#  PCRE_LIBRARIES - The libraries needed to use PCRE
+# also defined, but not for general use are
+#  PCRE_LIBRARY, where to find the PCRE library.
 
-# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
+#=============================================================================
+# Copyright 2011 Blender Foundation.
 #
-# Redistribution and use is allowed according to the terms of the BSD license.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
 
-if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
-  # Already in cache, be silent
-  set(PCRE_FIND_QUIETLY TRUE)
-endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
-	
-if (NOT WIN32)
-  # use pkg-config to get the directories and then use these values
-  # in the FIND_PATH() and FIND_LIBRARY() calls
-  find_package(PkgConfig)
-  pkg_check_modules(PC_PCRE QUIET libpcre)
-  set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER})
-endif (NOT WIN32)
+# If PCRE_ROOT_DIR was defined in the environment, use it.
+IF(NOT PCRE_ROOT_DIR AND NOT $ENV{PCRE_ROOT_DIR} STREQUAL "")
+  SET(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR})
+ENDIF()
 
-find_path(PCRE_INCLUDE_DIR pcre.h
-          HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS}
-          PATH_SUFFIXES pcre)
+SET(_pcre_SEARCH_DIRS
+  ${PCRE_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+)
 
-find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+FIND_PATH(PCRE_INCLUDE_DIR pcre.h
+  HINTS
+    ${_pcre_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include
+    include
+)
 
-find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+FIND_LIBRARY(PCRE_LIBRARY
+  NAMES
+    pcre
+  HINTS
+    ${_pcre_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
 
-include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG
+    PCRE_LIBRARY PCRE_INCLUDE_DIR)
 
-IF(NOT WIN32)
-        find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
-        mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
-        set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
-ELSE()
-        find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY  )
-        set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} )
-        mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCRE_LIBRARY)
-ENDIF()
+IF(PCRE_FOUND)
+  SET(PCRE_LIBRARIES ${PCRE_LIBRARY})
+  SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR})
+ENDIF(PCRE_FOUND)
+
+MARK_AS_ADVANCED(
+  PCRE_INCLUDE_DIR
+  PCRE_LIBRARY
+)

Modified: branches/soc-2011-tomato/build_files/cmake/Modules/FindXML2.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindXML2.cmake	2011-09-15 17:55:55 UTC (rev 40241)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindXML2.cmake	2011-09-15 18:59:30 UTC (rev 40242)
@@ -1,88 +1,68 @@
-# - Try to find XML2
-# Once done this will define
+# - Find XML2 library
+# Find the native XML2 includes and library
+# This module defines
+#  XML2_INCLUDE_DIRS, where to find xml2.h, Set when
+#                     XML2_INCLUDE_DIR is found.
+#  XML2_LIBRARIES, libraries to link against to use XML2.
+#  XML2_ROOT_DIR, The base directory to search for XML2.
+#                 This can also be an environment variable.
+#  XML2_FOUND, If false, do not try to use XML2.
 #
-#  XML2_FOUND - system has XML2
-#  XML2_INCLUDE_DIRS - the XML2 include directory
-#  XML2_LIBRARIES - Link these to use XML2
-#  XML2_DEFINITIONS - Compiler switches required for using XML2
+# also defined, but not for general use are
+#  XML2_LIBRARY, where to find the XML2 library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
 #
-#  Copyright (c) 2008 Andreas Schneider <mail at cynapses.org>
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
 #
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
 
+# If XML2_ROOT_DIR was defined in the environment, use it.
+IF(NOT XML2_ROOT_DIR AND NOT $ENV{XML2_ROOT_DIR} STREQUAL "")
+  SET(XML2_ROOT_DIR $ENV{XML2_ROOT_DIR})
+ENDIF()
 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list