[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38557] branches/merwin-spacenav: svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/ blender .

Nathan Letwory nathan at letworyinteractive.com
Thu Jul 21 11:41:00 CEST 2011


Revision: 38557
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38557
Author:   jesterking
Date:     2011-07-21 09:40:59 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender .

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

Modified Paths:
--------------
    branches/merwin-spacenav/CMakeLists.txt
    branches/merwin-spacenav/GNUmakefile
    branches/merwin-spacenav/SConstruct
    branches/merwin-spacenav/build_files/buildbot/master.cfg
    branches/merwin-spacenav/build_files/buildbot/master_unpack.py
    branches/merwin-spacenav/build_files/buildbot/slave_pack.py
    branches/merwin-spacenav/build_files/cmake/cmake_consistency_check.py
    branches/merwin-spacenav/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/merwin-spacenav/build_files/cmake/macros.cmake
    branches/merwin-spacenav/build_files/scons/config/aix4-config.py
    branches/merwin-spacenav/build_files/scons/config/linux2-config.py
    branches/merwin-spacenav/build_files/scons/config/win32-vc-config.py
    branches/merwin-spacenav/build_files/scons/config/win64-vc-config.py
    branches/merwin-spacenav/build_files/scons/tools/Blender.py
    branches/merwin-spacenav/build_files/scons/tools/btools.py
    branches/merwin-spacenav/doc/blender_file_format/BlendFileDnaExporter_25.py
    branches/merwin-spacenav/doc/blender_file_format/BlendFileReader.py
    branches/merwin-spacenav/doc/doxygen/Doxyfile
    branches/merwin-spacenav/doc/python_api/blender-org/layout.html
    branches/merwin-spacenav/doc/python_api/examples/bpy.types.RenderEngine.py
    branches/merwin-spacenav/doc/python_api/rst/bge.events.rst
    branches/merwin-spacenav/doc/python_api/rst/bge.logic.rst
    branches/merwin-spacenav/doc/python_api/rst/bge.types.rst
    branches/merwin-spacenav/doc/python_api/rst/change_log.rst
    branches/merwin-spacenav/doc/python_api/sphinx_changelog_gen.py
    branches/merwin-spacenav/doc/python_api/sphinx_doc_gen.py
    branches/merwin-spacenav/extern/binreloc/CMakeLists.txt
    branches/merwin-spacenav/extern/bullet2/CMakeLists.txt
    branches/merwin-spacenav/extern/eltopo/CMakeLists.txt
    branches/merwin-spacenav/extern/glew/CMakeLists.txt
    branches/merwin-spacenav/extern/libopenjpeg/CMakeLists.txt
    branches/merwin-spacenav/extern/lzo/CMakeLists.txt
    branches/merwin-spacenav/intern/CMakeLists.txt
    branches/merwin-spacenav/intern/audaspace/CMakeLists.txt
    branches/merwin-spacenav/intern/boolop/CMakeLists.txt
    branches/merwin-spacenav/intern/bsp/CMakeLists.txt
    branches/merwin-spacenav/intern/elbeem/extern/elbeem.h
    branches/merwin-spacenav/intern/elbeem/intern/simulation_object.cpp
    branches/merwin-spacenav/intern/elbeem/intern/solver_class.h
    branches/merwin-spacenav/intern/elbeem/intern/solver_init.cpp
    branches/merwin-spacenav/intern/elbeem/intern/solver_interface.h
    branches/merwin-spacenav/intern/ffmpeg/ffmpeg_compat.h
    branches/merwin-spacenav/intern/ghost/CMakeLists.txt
    branches/merwin-spacenav/intern/ghost/GHOST_Types.h
    branches/merwin-spacenav/intern/ghost/SConscript
    branches/merwin-spacenav/intern/ghost/intern/GHOST_Debug.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
    branches/merwin-spacenav/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_EventPrinter.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_ISystem.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemX11.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_Window.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_Window.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/merwin-spacenav/intern/ghost/intern/GHOST_WindowNULL.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/merwin-spacenav/intern/ghost/test/gears/GHOST_C-Test.c
    branches/merwin-spacenav/intern/ghost/test/gears/GHOST_Test.cpp
    branches/merwin-spacenav/intern/ghost/test/multitest/MultiTest.c
    branches/merwin-spacenav/intern/iksolver/intern/IK_QJacobian.cpp
    branches/merwin-spacenav/intern/iksolver/intern/IK_QJacobian.h
    branches/merwin-spacenav/intern/iksolver/intern/IK_QSegment.cpp
    branches/merwin-spacenav/intern/iksolver/intern/IK_QTask.cpp
    branches/merwin-spacenav/intern/itasc/ConstraintSet.cpp
    branches/merwin-spacenav/intern/mikktspace/mikktspace.c
    branches/merwin-spacenav/intern/smoke/CMakeLists.txt
    branches/merwin-spacenav/intern/smoke/intern/WAVELET_NOISE.h
    branches/merwin-spacenav/release/datafiles/splash.png
    branches/merwin-spacenav/release/scripts/modules/addon_utils.py
    branches/merwin-spacenav/release/scripts/modules/bpy/__init__.py
    branches/merwin-spacenav/release/scripts/modules/bpy/ops.py
    branches/merwin-spacenav/release/scripts/modules/bpy/path.py
    branches/merwin-spacenav/release/scripts/modules/bpy/utils.py
    branches/merwin-spacenav/release/scripts/modules/bpy_extras/image_utils.py
    branches/merwin-spacenav/release/scripts/modules/bpy_extras/io_utils.py
    branches/merwin-spacenav/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/merwin-spacenav/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/merwin-spacenav/release/scripts/modules/bpy_types.py
    branches/merwin-spacenav/release/scripts/modules/bpyml_ui.py
    branches/merwin-spacenav/release/scripts/modules/console/complete_namespace.py
    branches/merwin-spacenav/release/scripts/modules/console/intellisense.py
    branches/merwin-spacenav/release/scripts/modules/console_python.py
    branches/merwin-spacenav/release/scripts/modules/rna_prop_ui.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/image.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/mesh.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/nla.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/object_align.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/presets.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/merwin-spacenav/release/scripts/startup/bl_operators/wm.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_animviz.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_material.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_object.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_particle.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_render.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_texture.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/space_image.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/space_info.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/space_node.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/space_sequencer.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/space_userpref.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/space_view3d.py
    branches/merwin-spacenav/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/merwin-spacenav/release/scripts/startup/keyingsets_builtins.py
    branches/merwin-spacenav/release/text/GPL-license.txt
    branches/merwin-spacenav/release/text/readme.html
    branches/merwin-spacenav/source/blender/avi/AVI_avi.h
    branches/merwin-spacenav/source/blender/avi/CMakeLists.txt
    branches/merwin-spacenav/source/blender/avi/SConscript
    branches/merwin-spacenav/source/blender/avi/intern/avi.c
    branches/merwin-spacenav/source/blender/avi/intern/options.c
    branches/merwin-spacenav/source/blender/blenfont/CMakeLists.txt
    branches/merwin-spacenav/source/blender/blenkernel/BKE_action.h
    branches/merwin-spacenav/source/blender/blenkernel/BKE_blender.h
    branches/merwin-spacenav/source/blender/blenkernel/BKE_brush.h
    branches/merwin-spacenav/source/blender/blenkernel/BKE_depsgraph.h
    branches/merwin-spacenav/source/blender/blenkernel/BKE_displist.h
    branches/merwin-spacenav/source/blender/blenkernel/BKE_node.h
    branches/merwin-spacenav/source/blender/blenkernel/BKE_particle.h
    branches/merwin-spacenav/source/blender/blenkernel/CMakeLists.txt
    branches/merwin-spacenav/source/blender/blenkernel/SConscript
    branches/merwin-spacenav/source/blender/blenkernel/depsgraph_private.h
    branches/merwin-spacenav/source/blender/blenkernel/intern/BME_tools.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/action.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/anim.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/armature.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/blender.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/boids.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/brush.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/bvhutils.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/constraint.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/curve.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/depsgraph.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/displist.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/image.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/key.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/material.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/multires.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/node.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/object.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/paint.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/particle.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/particle_system.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/pointcache.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/sca.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/scene.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/seqeffects.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/sequencer.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/smoke.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/softbody.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/sound.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/texture.c
    branches/merwin-spacenav/source/blender/blenkernel/intern/writeffmpeg.c
    branches/merwin-spacenav/source/blender/blenlib/BLI_math_base.h
    branches/merwin-spacenav/source/blender/blenlib/BLI_math_color.h
    branches/merwin-spacenav/source/blender/blenlib/BLI_math_geom.h
    branches/merwin-spacenav/source/blender/blenlib/BLI_math_vector.h
    branches/merwin-spacenav/source/blender/blenlib/BLI_utildefines.h
    branches/merwin-spacenav/source/blender/blenlib/BLI_winstuff.h
    branches/merwin-spacenav/source/blender/blenlib/CMakeLists.txt
    branches/merwin-spacenav/source/blender/blenlib/intern/math_base_inline.c
    branches/merwin-spacenav/source/blender/blenlib/intern/math_color.c
    branches/merwin-spacenav/source/blender/blenlib/intern/math_geom.c
    branches/merwin-spacenav/source/blender/blenlib/intern/math_vector_inline.c
    branches/merwin-spacenav/source/blender/blenlib/intern/path_util.c
    branches/merwin-spacenav/source/blender/blenlib/intern/pbvh.c
    branches/merwin-spacenav/source/blender/blenlib/intern/storage.c
    branches/merwin-spacenav/source/blender/blenlib/intern/uvproject.c
    branches/merwin-spacenav/source/blender/blenloader/CMakeLists.txt
    branches/merwin-spacenav/source/blender/blenloader/intern/readfile.c
    branches/merwin-spacenav/source/blender/blenloader/intern/writefile.c
    branches/merwin-spacenav/source/blender/blenpluginapi/CMakeLists.txt
    branches/merwin-spacenav/source/blender/blenpluginapi/iff.h
    branches/merwin-spacenav/source/blender/collada/AnimationImporter.cpp
    branches/merwin-spacenav/source/blender/collada/ArmatureExporter.cpp
    branches/merwin-spacenav/source/blender/collada/ArmatureExporter.h
    branches/merwin-spacenav/source/blender/collada/ArmatureImporter.cpp
    branches/merwin-spacenav/source/blender/collada/CMakeLists.txt
    branches/merwin-spacenav/source/blender/collada/CameraExporter.cpp
    branches/merwin-spacenav/source/blender/collada/CameraExporter.h
    branches/merwin-spacenav/source/blender/collada/DocumentExporter.cpp
    branches/merwin-spacenav/source/blender/collada/DocumentExporter.h
    branches/merwin-spacenav/source/blender/collada/DocumentImporter.cpp
    branches/merwin-spacenav/source/blender/collada/DocumentImporter.h
    branches/merwin-spacenav/source/blender/collada/EffectExporter.cpp
    branches/merwin-spacenav/source/blender/collada/EffectExporter.h
    branches/merwin-spacenav/source/blender/collada/GeometryExporter.cpp
    branches/merwin-spacenav/source/blender/collada/GeometryExporter.h
    branches/merwin-spacenav/source/blender/collada/ImageExporter.cpp
    branches/merwin-spacenav/source/blender/collada/ImageExporter.h
    branches/merwin-spacenav/source/blender/collada/LightExporter.cpp
    branches/merwin-spacenav/source/blender/collada/LightExporter.h
    branches/merwin-spacenav/source/blender/collada/MaterialExporter.cpp
    branches/merwin-spacenav/source/blender/collada/MaterialExporter.h
    branches/merwin-spacenav/source/blender/collada/MeshImporter.cpp
    branches/merwin-spacenav/source/blender/collada/MeshImporter.h
    branches/merwin-spacenav/source/blender/collada/SkinInfo.cpp
    branches/merwin-spacenav/source/blender/collada/collada.cpp
    branches/merwin-spacenav/source/blender/collada/collada.h
    branches/merwin-spacenav/source/blender/collada/collada_internal.cpp
    branches/merwin-spacenav/source/blender/editors/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/animation/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/animation/anim_markers.c
    branches/merwin-spacenav/source/blender/editors/animation/anim_ops.c
    branches/merwin-spacenav/source/blender/editors/armature/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/armature/armature_intern.h
    branches/merwin-spacenav/source/blender/editors/armature/armature_ops.c
    branches/merwin-spacenav/source/blender/editors/armature/editarmature.c
    branches/merwin-spacenav/source/blender/editors/armature/poseUtils.c
    branches/merwin-spacenav/source/blender/editors/curve/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/curve/editcurve.c
    branches/merwin-spacenav/source/blender/editors/datafiles/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/datafiles/preview.blend.c
    branches/merwin-spacenav/source/blender/editors/datafiles/splash.png.c
    branches/merwin-spacenav/source/blender/editors/datafiles/startup.blend.c
    branches/merwin-spacenav/source/blender/editors/gpencil/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/include/ED_curve.h
    branches/merwin-spacenav/source/blender/editors/include/ED_mesh.h
    branches/merwin-spacenav/source/blender/editors/include/ED_view3d.h
    branches/merwin-spacenav/source/blender/editors/include/UI_interface.h
    branches/merwin-spacenav/source/blender/editors/interface/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/interface/interface.c
    branches/merwin-spacenav/source/blender/editors/interface/interface_draw.c
    branches/merwin-spacenav/source/blender/editors/interface/interface_handlers.c
    branches/merwin-spacenav/source/blender/editors/interface/interface_layout.c
    branches/merwin-spacenav/source/blender/editors/interface/interface_regions.c
    branches/merwin-spacenav/source/blender/editors/interface/interface_style.c
    branches/merwin-spacenav/source/blender/editors/interface/interface_templates.c
    branches/merwin-spacenav/source/blender/editors/interface/interface_widgets.c
    branches/merwin-spacenav/source/blender/editors/interface/resources.c
    branches/merwin-spacenav/source/blender/editors/interface/view2d.c
    branches/merwin-spacenav/source/blender/editors/mesh/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/mesh/editmesh_loop.c
    branches/merwin-spacenav/source/blender/editors/mesh/editmesh_mods.c
    branches/merwin-spacenav/source/blender/editors/mesh/editmesh_tools.c
    branches/merwin-spacenav/source/blender/editors/mesh/mesh_data.c
    branches/merwin-spacenav/source/blender/editors/metaball/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/object/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/object/object_add.c
    branches/merwin-spacenav/source/blender/editors/object/object_bake.c
    branches/merwin-spacenav/source/blender/editors/object/object_edit.c
    branches/merwin-spacenav/source/blender/editors/object/object_hook.c
    branches/merwin-spacenav/source/blender/editors/object/object_modifier.c
    branches/merwin-spacenav/source/blender/editors/object/object_relations.c
    branches/merwin-spacenav/source/blender/editors/object/object_vgroup.c
    branches/merwin-spacenav/source/blender/editors/physics/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/physics/particle_edit.c
    branches/merwin-spacenav/source/blender/editors/physics/physics_fluid.c
    branches/merwin-spacenav/source/blender/editors/render/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/render/render_internal.c
    branches/merwin-spacenav/source/blender/editors/render/render_opengl.c
    branches/merwin-spacenav/source/blender/editors/render/render_preview.c
    branches/merwin-spacenav/source/blender/editors/screen/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/screen/area.c
    branches/merwin-spacenav/source/blender/editors/screen/screen_edit.c
    branches/merwin-spacenav/source/blender/editors/screen/screen_ops.c
    branches/merwin-spacenav/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/sculpt_paint/paint_image.c
    branches/merwin-spacenav/source/blender/editors/sculpt_paint/sculpt.c
    branches/merwin-spacenav/source/blender/editors/sound/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/sound/sound_ops.c
    branches/merwin-spacenav/source/blender/editors/space_action/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_api/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_buttons/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_buttons/buttons_context.c
    branches/merwin-spacenav/source/blender/editors/space_buttons/buttons_intern.h
    branches/merwin-spacenav/source/blender/editors/space_buttons/buttons_ops.c
    branches/merwin-spacenav/source/blender/editors/space_buttons/space_buttons.c
    branches/merwin-spacenav/source/blender/editors/space_console/console_draw.c
    branches/merwin-spacenav/source/blender/editors/space_console/console_ops.c
    branches/merwin-spacenav/source/blender/editors/space_file/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_file/file_draw.c
    branches/merwin-spacenav/source/blender/editors/space_file/file_ops.c
    branches/merwin-spacenav/source/blender/editors/space_file/filelist.c
    branches/merwin-spacenav/source/blender/editors/space_file/filesel.c
    branches/merwin-spacenav/source/blender/editors/space_graph/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_graph/graph_edit.c
    branches/merwin-spacenav/source/blender/editors/space_image/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_image/image_buttons.c
    branches/merwin-spacenav/source/blender/editors/space_info/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_info/info_stats.c
    branches/merwin-spacenav/source/blender/editors/space_logic/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_logic/logic_window.c
    branches/merwin-spacenav/source/blender/editors/space_nla/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_node/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_node/drawnode.c
    branches/merwin-spacenav/source/blender/editors/space_node/node_buttons.c
    branches/merwin-spacenav/source/blender/editors/space_node/node_draw.c
    branches/merwin-spacenav/source/blender/editors/space_node/node_edit.c
    branches/merwin-spacenav/source/blender/editors/space_node/node_header.c
    branches/merwin-spacenav/source/blender/editors/space_node/node_intern.h
    branches/merwin-spacenav/source/blender/editors/space_node/node_ops.c
    branches/merwin-spacenav/source/blender/editors/space_node/space_node.c
    branches/merwin-spacenav/source/blender/editors/space_outliner/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_outliner/outliner.c
    branches/merwin-spacenav/source/blender/editors/space_script/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_sequencer/sequencer_add.c
    branches/merwin-spacenav/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/merwin-spacenav/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/merwin-spacenav/source/blender/editors/space_sound/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_text/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_time/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_userpref/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_view3d/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/space_view3d/drawanimviz.c
    branches/merwin-spacenav/source/blender/editors/space_view3d/drawarmature.c
    branches/merwin-spacenav/source/blender/editors/space_view3d/drawobject.c
    branches/merwin-spacenav/source/blender/editors/space_view3d/space_view3d.c
    branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_buttons.c
    branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_draw.c
    branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_intern.h
    branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_select.c
    branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_view.c
    branches/merwin-spacenav/source/blender/editors/transform/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/transform/transform.c
    branches/merwin-spacenav/source/blender/editors/transform/transform.h
    branches/merwin-spacenav/source/blender/editors/transform/transform_constraints.c
    branches/merwin-spacenav/source/blender/editors/transform/transform_conversions.c
    branches/merwin-spacenav/source/blender/editors/transform/transform_generics.c
    branches/merwin-spacenav/source/blender/editors/transform/transform_manipulator.c
    branches/merwin-spacenav/source/blender/editors/transform/transform_snap.c
    branches/merwin-spacenav/source/blender/editors/util/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/util/ed_util.c
    branches/merwin-spacenav/source/blender/editors/util/undo.c
    branches/merwin-spacenav/source/blender/editors/uvedit/CMakeLists.txt
    branches/merwin-spacenav/source/blender/editors/uvedit/uvedit_draw.c
    branches/merwin-spacenav/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/merwin-spacenav/source/blender/gpu/CMakeLists.txt
    branches/merwin-spacenav/source/blender/gpu/GPU_buffers.h
    branches/merwin-spacenav/source/blender/gpu/GPU_draw.h
    branches/merwin-spacenav/source/blender/gpu/SConscript
    branches/merwin-spacenav/source/blender/gpu/intern/gpu_buffers.c
    branches/merwin-spacenav/source/blender/gpu/intern/gpu_draw.c
    branches/merwin-spacenav/source/blender/gpu/intern/gpu_material.c
    branches/merwin-spacenav/source/blender/ikplugin/CMakeLists.txt
    branches/merwin-spacenav/source/blender/imbuf/CMakeLists.txt
    branches/merwin-spacenav/source/blender/imbuf/IMB_imbuf.h
    branches/merwin-spacenav/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/merwin-spacenav/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/merwin-spacenav/source/blender/imbuf/intern/divers.c
    branches/merwin-spacenav/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/merwin-spacenav/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/merwin-spacenav/source/blender/imbuf/intern/rectop.c
    branches/merwin-spacenav/source/blender/imbuf/intern/util.c
    branches/merwin-spacenav/source/blender/makesdna/DNA_actuator_types.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_image_types.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_material_types.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_object_fluidsim.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_object_force.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_object_types.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_particle_types.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_scene_types.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_sequence_types.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_space_types.h
    branches/merwin-spacenav/source/blender/makesdna/DNA_userdef_types.h
    branches/merwin-spacenav/source/blender/makesdna/intern/makesdna.c
    branches/merwin-spacenav/source/blender/makesrna/RNA_access.h
    branches/merwin-spacenav/source/blender/makesrna/RNA_types.h
    branches/merwin-spacenav/source/blender/makesrna/intern/CMakeLists.txt
    branches/merwin-spacenav/source/blender/makesrna/intern/makesrna.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_ID.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_access.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_actuator.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_armature.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_camera.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_constraint.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_controller.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_curve.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_fluidsim.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_group.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_image.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_internal_types.h
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_material.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_mesh.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_modifier.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_nodetree.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_object.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_object_api.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_object_force.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_particle.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_pose.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_render.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_rna.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_scene.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_scene_api.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_sequencer.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_space.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_texture.c
    branches/merwin-spacenav/source/blender/makesrna/intern/rna_userdef.c
    branches/merwin-spacenav/source/blender/modifiers/CMakeLists.txt
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_cast.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_cloth.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_displace.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_explode.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_hook.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_mask.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_smoke.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_smooth.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_solidify.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_util.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_util.h
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_warp.c
    branches/merwin-spacenav/source/blender/modifiers/intern/MOD_wave.c
    branches/merwin-spacenav/source/blender/nodes/CMakeLists.txt
    branches/merwin-spacenav/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
    branches/merwin-spacenav/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
    branches/merwin-spacenav/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
    branches/merwin-spacenav/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/merwin-spacenav/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/merwin-spacenav/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
    branches/merwin-spacenav/source/blender/nodes/intern/CMP_util.c
    branches/merwin-spacenav/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/merwin-spacenav/source/blender/nodes/intern/SHD_util.c
    branches/merwin-spacenav/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
    branches/merwin-spacenav/source/blender/python/BPY_extern.h
    branches/merwin-spacenav/source/blender/python/CMakeLists.txt
    branches/merwin-spacenav/source/blender/python/SConscript
    branches/merwin-spacenav/source/blender/python/generic/CMakeLists.txt
    branches/merwin-spacenav/source/blender/python/generic/IDProp.c
    branches/merwin-spacenav/source/blender/python/generic/IDProp.h
    branches/merwin-spacenav/source/blender/python/generic/bgl.c
    branches/merwin-spacenav/source/blender/python/generic/py_capi_utils.c
    branches/merwin-spacenav/source/blender/python/generic/py_capi_utils.h
    branches/merwin-spacenav/source/blender/python/intern/CMakeLists.txt
    branches/merwin-spacenav/source/blender/python/intern/bpy.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_app.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_driver.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_interface.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_props.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_rna.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_rna.h
    branches/merwin-spacenav/source/blender/python/intern/bpy_rna_array.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_util.c
    branches/merwin-spacenav/source/blender/quicktime/CMakeLists.txt
    branches/merwin-spacenav/source/blender/quicktime/apple/qtkit_export.m
    branches/merwin-spacenav/source/blender/render/CMakeLists.txt
    branches/merwin-spacenav/source/blender/render/SConscript
    branches/merwin-spacenav/source/blender/render/extern/include/RE_pipeline.h
    branches/merwin-spacenav/source/blender/render/extern/include/RE_shader_ext.h
    branches/merwin-spacenav/source/blender/render/intern/include/rayobject.h
    branches/merwin-spacenav/source/blender/render/intern/include/render_types.h
    branches/merwin-spacenav/source/blender/render/intern/source/convertblender.c
    branches/merwin-spacenav/source/blender/render/intern/source/envmap.c
    branches/merwin-spacenav/source/blender/render/intern/source/imagetexture.c
    branches/merwin-spacenav/source/blender/render/intern/source/pipeline.c
    branches/merwin-spacenav/source/blender/render/intern/source/pixelshading.c
    branches/merwin-spacenav/source/blender/render/intern/source/rayshade.c
    branches/merwin-spacenav/source/blender/render/intern/source/render_texture.c
    branches/merwin-spacenav/source/blender/render/intern/source/rendercore.c
    branches/merwin-spacenav/source/blender/render/intern/source/renderdatabase.c
    branches/merwin-spacenav/source/blender/render/intern/source/shadeinput.c
    branches/merwin-spacenav/source/blender/render/intern/source/shadeoutput.c
    branches/merwin-spacenav/source/blender/render/intern/source/strand.c
    branches/merwin-spacenav/source/blender/render/intern/source/sunsky.c
    branches/merwin-spacenav/source/blender/render/intern/source/volume_precache.c
    branches/merwin-spacenav/source/blender/render/intern/source/volumetric.c
    branches/merwin-spacenav/source/blender/render/intern/source/voxeldata.c
    branches/merwin-spacenav/source/blender/render/intern/source/zbuf.c
    branches/merwin-spacenav/source/blender/windowmanager/CMakeLists.txt
    branches/merwin-spacenav/source/blender/windowmanager/intern/wm_event_system.c
    branches/merwin-spacenav/source/blender/windowmanager/intern/wm_files.c
    branches/merwin-spacenav/source/blender/windowmanager/intern/wm_init_exit.c
    branches/merwin-spacenav/source/blender/windowmanager/intern/wm_operators.c
    branches/merwin-spacenav/source/blender/windowmanager/intern/wm_window.c
    branches/merwin-spacenav/source/blenderplayer/CMakeLists.txt
    branches/merwin-spacenav/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/merwin-spacenav/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/merwin-spacenav/source/creator/CMakeLists.txt
    branches/merwin-spacenav/source/creator/SConscript
    branches/merwin-spacenav/source/creator/creator.c
    branches/merwin-spacenav/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/merwin-spacenav/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/merwin-spacenav/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/merwin-spacenav/source/gameengine/Converter/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/merwin-spacenav/source/gameengine/Expressions/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/merwin-spacenav/source/gameengine/Expressions/PyObjectPlus.h
    branches/merwin-spacenav/source/gameengine/GameLogic/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/merwin-spacenav/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/merwin-spacenav/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/merwin-spacenav/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/merwin-spacenav/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/merwin-spacenav/source/gameengine/GamePlayer/ghost/SConscript
    branches/merwin-spacenav/source/gameengine/Ketsji/BL_Texture.cpp
    branches/merwin-spacenav/source/gameengine/Ketsji/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_Camera.cpp
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_PyMath.h
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/merwin-spacenav/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/merwin-spacenav/source/gameengine/Ketsji/SConscript
    branches/merwin-spacenav/source/gameengine/Network/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/merwin-spacenav/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/merwin-spacenav/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/merwin-spacenav/source/gameengine/Rasterizer/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/merwin-spacenav/source/gameengine/VideoTexture/CMakeLists.txt
    branches/merwin-spacenav/source/tests/CMakeLists.txt
    branches/merwin-spacenav/source/tests/bl_load_py_modules.py
    branches/merwin-spacenav/source/tools/CTS/FBlender.py

Added Paths:
-----------
    branches/merwin-spacenav/build_files/cmake/Modules/FindFftw3.cmake
    branches/merwin-spacenav/build_files/cmake/Modules/FindJack.cmake
    branches/merwin-spacenav/build_files/cmake/Modules/FindJeMalloc.cmake
    branches/merwin-spacenav/build_files/cmake/Modules/FindOpenEXR.cmake
    branches/merwin-spacenav/build_files/cmake/Modules/FindOpenJPEG.cmake
    branches/merwin-spacenav/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/merwin-spacenav/build_files/cmake/Modules/FindSamplerate.cmake
    branches/merwin-spacenav/build_files/cmake/Modules/FindSndFile.cmake
    branches/merwin-spacenav/build_files/cmake/cmake_consistency_check_config.py
    branches/merwin-spacenav/doc/python_api/examples/aud.py
    branches/merwin-spacenav/doc/python_api/examples/bge.constraints.py
    branches/merwin-spacenav/doc/python_api/examples/bge.texture.1.py
    branches/merwin-spacenav/doc/python_api/examples/bge.texture.py
    branches/merwin-spacenav/doc/python_api/examples/blf.py
    branches/merwin-spacenav/doc/python_api/examples/bpy.props.4.py
    branches/merwin-spacenav/doc/python_api/rst/bge.constraints.rst
    branches/merwin-spacenav/doc/python_api/rst/bge.texture.rst
    branches/merwin-spacenav/doc/python_api/rst/bgl.rst
    branches/merwin-spacenav/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_DisplayManagerSDL.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemSDL.h
    branches/merwin-spacenav/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_WindowSDL.h
    branches/merwin-spacenav/intern/ghost/test/CMakeLists.txt
    branches/merwin-spacenav/release/scripts/templates/batch_export.py
    branches/merwin-spacenav/source/blender/blenlib/BLI_callbacks.h
    branches/merwin-spacenav/source/blender/blenlib/intern/callbacks.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_app_handlers.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_app_handlers.h
    branches/merwin-spacenav/source/blender/python/intern/bpy_intern_string.c
    branches/merwin-spacenav/source/blender/python/intern/bpy_intern_string.h
    branches/merwin-spacenav/source/blender/python/mathutils/
    branches/merwin-spacenav/source/blender/python/mathutils/CMakeLists.txt
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Color.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Color.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Euler.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Euler.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Matrix.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Matrix.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Vector.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Vector.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_geometry.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_geometry.h
    branches/merwin-spacenav/source/tests/check_deprecated.py

Removed Paths:
-------------
    branches/merwin-spacenav/build_files/cmake/FindPythonLibsUnix.cmake
    branches/merwin-spacenav/doc/python_api/epy/BGL.py
    branches/merwin-spacenav/source/blender/blenlib/intern/BLI_callbacks.h
    branches/merwin-spacenav/source/blender/python/generic/mathutils.c
    branches/merwin-spacenav/source/blender/python/generic/mathutils.h
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Color.c
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Color.h
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Euler.c
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Euler.h
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Matrix.c
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Matrix.h
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Quaternion.c
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Quaternion.h
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Vector.c
    branches/merwin-spacenav/source/blender/python/generic/mathutils_Vector.h
    branches/merwin-spacenav/source/blender/python/generic/mathutils_geometry.c
    branches/merwin-spacenav/source/blender/python/generic/mathutils_geometry.h
    branches/merwin-spacenav/source/blender/python/mathutils/CMakeLists.txt
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Color.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Color.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Euler.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Euler.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Matrix.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Matrix.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Vector.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_Vector.h
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_geometry.c
    branches/merwin-spacenav/source/blender/python/mathutils/mathutils_geometry.h

Property Changed:
----------------
    branches/merwin-spacenav/


Property changes on: branches/merwin-spacenav
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/blender:37274-38554

Modified: branches/merwin-spacenav/CMakeLists.txt
===================================================================
--- branches/merwin-spacenav/CMakeLists.txt	2011-07-21 09:23:25 UTC (rev 38556)
+++ branches/merwin-spacenav/CMakeLists.txt	2011-07-21 09:40:59 UTC (rev 38557)
@@ -49,9 +49,16 @@
 
 cmake_minimum_required(VERSION 2.8)
 
+if(NOT EXECUTABLE_OUTPUT_PATH)
+	set(FIRST_RUN "TRUE")
+endif()
+
 # this starts out unset
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules/")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
 
+# avoid having empty buildtype
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
 # quiet output for Makefiles, 'make -s' helps too
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
@@ -83,6 +90,9 @@
 get_blender_version()
 
 # Blender internal features
+option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
+mark_as_advanced(WITH_BLENDER)
+
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
 
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
@@ -99,9 +109,21 @@
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
 
+# GHOST Windowing Library Options
+option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
+mark_as_advanced(WITH_GHOST_DEBUG)
+
+option(WITH_GHOST_SDL    "Enable building blender against SDL for windowing rather then the native APIs" OFF)
+mark_as_advanced(WITH_GHOST_SDL)
+
+# Misc...
 option(WITH_HEADLESS      "Build without graphical support (renderfarm, server mode only)" OFF)
 mark_as_advanced(WITH_HEADLESS)
 
+option(WITH_AUDASPACE    "Build with blenders audio library (only disable if you know what you're doing!)" ON)
+mark_as_advanced(WITH_AUDASPACE)
+
+
 # (unix defaults to OpenMP On)
 if(UNIX AND NOT APPLE)
 	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
@@ -119,6 +141,7 @@
 
 # Modifiers
 option(WITH_MOD_FLUID        	"Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_SMOKE        	"Enable Smoke Modifier (Smoke Simulation)" ON)
 option(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
 option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" OFF)
@@ -134,7 +157,7 @@
 option(WITH_IMAGE_REDCODE       "Enable RedCode Image Support" OFF)
 
 # Audio/Video format support
-option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
+option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
 option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 if(APPLE OR (WIN32 AND NOT UNIX))
 	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
@@ -189,14 +212,25 @@
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
 endif()
 
+#-----------------------------------------------------------------------------
+# Check for conflicting/unsupported configurations
+
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER)
+	message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
+endif()
+
 if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
-	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
 endif()
 
+if(NOT WITH_SDL AND WITH_GHOST_SDL)
+	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+endif()
+
 if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
 	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
 endif()
@@ -210,14 +244,17 @@
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
+if(WITH_CODEC_QUICKTIME AND MINGW)
+	message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+						"because it is currently unsupported, remove this "
+						"line if youre a developer who wants to add support.")
+endif()
+
 # may as well build python module without a UI
 if(WITH_PYTHON_MODULE)
 	set(WITH_HEADLESS ON)
 endif()
 
-# remove old vars
-unset(WITH_INSTALL CACHE)
-
 TEST_SSE_SUPPORT()
 
 #-----------------------------------------------------------------------------
@@ -226,11 +263,27 @@
 # linux only, not cached
 set(WITH_BINRELOC OFF)
 
+# MAXOSX only, set to avoid uninitialized 
+set(EXETYPE)
+
+# C/C++ flags
+set(PLATFORM_CFLAGS)
+
 # these are added to later on.
-set(C_WARNINGS "")
-set(CXX_WARNINGS "")
+set(C_WARNINGS)
+set(CXX_WARNINGS)
 
+# libraries to link the binary with passed to target_link_libraries()
+# known as LLIBS to scons
+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)
+
+
 # disabled for now, not supported
 # option(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 
@@ -238,13 +291,12 @@
 # On Unix: 
 #   cmake ../blender \
 #         -D PYTHON_VERSION=3.2 \
-#         -D PYTHON_INCLUDE_DIRS=/opt/py32/include/python3.2d \
-#         -D PYTHON_LIBPATH=/opt/py32/lib \
-#         -D PYTHON_LIBRARY=python3.2d
+#         -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
+#         -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
 #
 # On Macs: 
 #   cmake ../blender \
-#         -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
+#         -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 \
 #         -G Xcode
 #
@@ -260,65 +312,48 @@
 		set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
 	endif()
 
-	if(WITH_OPENAL)
-		find_package(OpenAL)
-		if(NOT OPENAL_FOUND)
-			set(WITH_OPENAL OFF)
-		endif()
-	endif()
+	find_package(JPEG REQUIRED)
+	find_package(PNG REQUIRED)
+	find_package(ZLIB REQUIRED)
+	find_package(Freetype REQUIRED)
 
-	if(WITH_JACK)
-		set(JACK /usr)
-		set(JACK_INC ${JACK}/include/jack)
-		set(JACK_LIB jack)
-		set(JACK_LIBPATH ${JACK}/lib)
-	endif()
+	if(WITH_PYTHON)
+		# No way to set py32. remove for now.
+		# find_package(PythonLibs)
 
-	if(WITH_CODEC_SNDFILE)
-		set(SNDFILE /usr)
-		set(SNDFILE_INC ${SNDFILE}/include)
-		set(SNDFILE_LIB sndfile)
-		set(SNDFILE_LIBPATH ${SNDFILE}/lib)
+		# Use our own instead, since wothout py is such a rare case,
+		# require this package
+		find_package(PythonLibsUnix REQUIRED)
 	endif()
 
-	if(WITH_INTERNATIONAL)
-		find_library(INTL_LIBRARY
-			NAMES intl
-			PATHS
-			/sw/lib
-		)
 
-		find_library(ICONV_LIBRARY
-			NAMES iconv
-			PATHS
-			/sw/lib
-		)
-		mark_as_advanced(ICONV_LIBRARY)
-		mark_as_advanced(INTL_LIBRARY)
+	if(WITH_IMAGE_OPENEXR)
+		find_package(OpenEXR)  # our own module
+		if(NOT OPENEXR_FOUND)
+			set(WITH_IMAGE_OPENEXR OFF)
+		endif()
+	endif()
 
-		if(INTL_LIBRARY AND ICONV_LIBRARY)
-			set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+	if(WITH_IMAGE_OPENJPEG)
+		find_package(OpenJPEG)
+		if(NOT OPENJPEG_FOUND)
+			set(WITH_IMAGE_OPENJPEG OFF)
 		endif()
 	endif()
 
-	find_package(Freetype)
-	# unset(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+	if(WITH_IMAGE_TIFF)
+		find_package(TIFF)
+		if(NOT TIFF_FOUND)
+			set(WITH_IMAGE_TIFF OFF)
+		endif()
+	endif()
 
-
-	if(WITH_PYTHON)
-		# No way to set py32. remove for now.
-		# find_package(PythonLibs)
-
-		# defines...
-		
-		#  PYTHON_VERSION
-		#  PYTHON_INCLUDE_DIRS
-		#  PYTHON_LIBRARY
-		#  PYTHON_LIBPATH
-		#  PYTHON_LINKFLAGS
-
-		include(build_files/cmake/FindPythonLibsUnix.cmake)
-
+	# Audio IO
+	if(WITH_OPENAL)
+		find_package(OpenAL)
+		if(NOT OPENAL_FOUND)
+			set(WITH_OPENAL OFF)
+		endif()
 	endif()
 
 	if(WITH_SDL)
@@ -333,90 +368,88 @@
 		endif()
 	endif()
 
-	if(WITH_IMAGE_OPENEXR)
-		set(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
-		mark_as_advanced(OPENEXR)
-		find_path(OPENEXR_INC
-			ImfXdr.h
-			PATHS
-			${OPENEXR}/include/OpenEXR
-			/usr/local/include/OpenEXR
-			/sw/include/OpenEXR
-			/opt/local/include/OpenEXR
-			/opt/csw/include/OpenEXR
-			/opt/include/OpenEXR
-		)
-		mark_as_advanced(OPENEXR_INC)
-
-		set(OPENEXR_LIB Half IlmImf Iex Imath)
-		
-		if(NOT OPENEXR_INC)
-			set(WITH_IMAGE_OPENEXR OFF)
+	if(WITH_JACK)
+		find_package(Jack)
+		if(NOT JACK_FOUND)
+			set(WITH_JACK OFF)
 		endif()
 	endif()
 
-	if(WITH_IMAGE_TIFF)
-		find_package(TIFF)
-		if(NOT TIFF_FOUND)
-			set(WITH_IMAGE_TIFF OFF)
+	# Codecs
+	if(WITH_CODEC_SNDFILE)
+		find_package(SndFile)
+		if(NOT SNDFILE_FOUND)
+			set(WITH_CODEC_SNDFILE OFF)
 		endif()
 	endif()
 
-	find_package(JPEG REQUIRED)
-
-	find_package(PNG REQUIRED)
-
-	find_package(ZLIB REQUIRED)
-
 	if(WITH_CODEC_FFMPEG)
-		set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+		set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
 		mark_as_advanced(FFMPEG)
-		set(FFMPEG_INC ${FFMPEG}/include)
-		set(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
-		mark_as_advanced(FFMPEG_LIB)
+		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+		set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
+		mark_as_advanced(FFMPEG_LIBRARIES)
 		set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
 	endif()
 
+	if(WITH_INTERNATIONAL)
+		find_library(INTL_LIBRARY
+			NAMES intl
+			PATHS
+			/sw/lib
+		)
+
+		find_library(ICONV_LIBRARY
+			NAMES iconv
+			PATHS
+			/sw/lib
+		)
+		mark_as_advanced(ICONV_LIBRARY)
+		mark_as_advanced(INTL_LIBRARY)
+
+		if(INTL_LIBRARY AND ICONV_LIBRARY)
+			set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+		endif()
+	endif()
+
 	if(WITH_FFTW3)
-		set(FFTW3 /usr)
-		set(FFTW3_INC ${FFTW3}/include)
-		set(FFTW3_LIB fftw3)
-		set(FFTW3_LIBPATH ${FFTW3}/lib)
+		find_package(Fftw3)
+		if(NOT FFTW3_FOUND)
+			set(WITH_FFTW3 OFF)
+		endif()
 	endif()
 
 	if(WITH_SAMPLERATE)
-		set(LIBSAMPLERATE /usr)
-		set(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-		set(LIBSAMPLERATE_LIB samplerate)
-		set(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list