[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59489] branches/soc-2013-motion_track: Merging from trunk r59488 into soc-2013-motion_track

Joseph Mansfield sftrabbit at gmail.com
Sun Aug 25 00:58:21 CEST 2013


Revision: 59489
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59489
Author:   sftrabbit
Date:     2013-08-24 22:58:20 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Merging from trunk r59488 into soc-2013-motion_track

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

Modified Paths:
--------------
    branches/soc-2013-motion_track/CMakeLists.txt
    branches/soc-2013-motion_track/build_files/build_environment/install_deps.sh
    branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_cppcheck.py
    branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_smatch.py
    branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_sparse.py
    branches/soc-2013-motion_track/build_files/cmake/macros.cmake
    branches/soc-2013-motion_track/build_files/cmake/project_source_info.py
    branches/soc-2013-motion_track/build_files/scons/tools/Blender.py
    branches/soc-2013-motion_track/doc/python_api/rst/bge.logic.rst
    branches/soc-2013-motion_track/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
    branches/soc-2013-motion_track/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
    branches/soc-2013-motion_track/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/soc-2013-motion_track/extern/libmv/libmv/multiview/euclidean_resection.h
    branches/soc-2013-motion_track/extern/libmv/libmv/tracking/track_region.cc
    branches/soc-2013-motion_track/extern/libmv/libmv-capi.cc
    branches/soc-2013-motion_track/extern/libmv/libmv-capi.h
    branches/soc-2013-motion_track/extern/libmv/libmv-capi_stub.cc
    branches/soc-2013-motion_track/extern/recastnavigation/recast-capi.cpp
    branches/soc-2013-motion_track/extern/recastnavigation/recast-capi.h
    branches/soc-2013-motion_track/intern/CMakeLists.txt
    branches/soc-2013-motion_track/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/soc-2013-motion_track/intern/audaspace/OpenAL/AUD_OpenALDevice.h
    branches/soc-2013-motion_track/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/soc-2013-motion_track/intern/audaspace/intern/AUD_IHandle.h
    branches/soc-2013-motion_track/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/soc-2013-motion_track/intern/audaspace/intern/AUD_SoftwareDevice.h
    branches/soc-2013-motion_track/intern/audaspace/intern/AUD_Space.h
    branches/soc-2013-motion_track/intern/cycles/CMakeLists.txt
    branches/soc-2013-motion_track/intern/cycles/app/cycles_server.cpp
    branches/soc-2013-motion_track/intern/cycles/app/cycles_test.cpp
    branches/soc-2013-motion_track/intern/cycles/app/cycles_xml.cpp
    branches/soc-2013-motion_track/intern/cycles/app/cycles_xml.h
    branches/soc-2013-motion_track/intern/cycles/app/io_export_cycles_xml.py
    branches/soc-2013-motion_track/intern/cycles/blender/CCL_api.h
    branches/soc-2013-motion_track/intern/cycles/blender/addon/__init__.py
    branches/soc-2013-motion_track/intern/cycles/blender/addon/engine.py
    branches/soc-2013-motion_track/intern/cycles/blender/addon/osl.py
    branches/soc-2013-motion_track/intern/cycles/blender/addon/presets.py
    branches/soc-2013-motion_track/intern/cycles/blender/addon/properties.py
    branches/soc-2013-motion_track/intern/cycles/blender/addon/ui.py
    branches/soc-2013-motion_track/intern/cycles/blender/blender_camera.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_curves.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_particles.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_python.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_session.h
    branches/soc-2013-motion_track/intern/cycles/blender/blender_shader.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_sync.cpp
    branches/soc-2013-motion_track/intern/cycles/blender/blender_sync.h
    branches/soc-2013-motion_track/intern/cycles/blender/blender_util.h
    branches/soc-2013-motion_track/intern/cycles/bvh/bvh.cpp
    branches/soc-2013-motion_track/intern/cycles/device/device.cpp
    branches/soc-2013-motion_track/intern/cycles/device/device.h
    branches/soc-2013-motion_track/intern/cycles/device/device_cpu.cpp
    branches/soc-2013-motion_track/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-motion_track/intern/cycles/device/device_intern.h
    branches/soc-2013-motion_track/intern/cycles/device/device_memory.h
    branches/soc-2013-motion_track/intern/cycles/device/device_multi.cpp
    branches/soc-2013-motion_track/intern/cycles/device/device_network.cpp
    branches/soc-2013-motion_track/intern/cycles/device/device_network.h
    branches/soc-2013-motion_track/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-motion_track/intern/cycles/device/device_task.cpp
    branches/soc-2013-motion_track/intern/cycles/device/device_task.h
    branches/soc-2013-motion_track/intern/cycles/doc/license/CMakeLists.txt
    branches/soc-2013-motion_track/intern/cycles/doc/license/readme.txt
    branches/soc-2013-motion_track/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2013-motion_track/intern/cycles/kernel/closure/bsdf.h
    branches/soc-2013-motion_track/intern/cycles/kernel/closure/bsdf_microfacet.h
    branches/soc-2013-motion_track/intern/cycles/kernel/closure/bsdf_oren_nayar.h
    branches/soc-2013-motion_track/intern/cycles/kernel/closure/bssrdf.h
    branches/soc-2013-motion_track/intern/cycles/kernel/closure/volume.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel.cl
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel.cpp
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel.cu
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_camera.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_compat_cuda.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_compat_opencl.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_curve.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_differential.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_displace.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_emission.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_film.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_globals.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_jitter.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_light.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_math.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_object.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_passes.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_primitive.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_random.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_shader.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_sse2.cpp
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_sse3.cpp
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_subsurface.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_textures.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_triangle.h
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_bssrdf.cpp
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_bssrdf.h
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_closures.h
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_globals.h
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_services.h
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_shader.h
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_add_closure.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_attribute.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_background.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_brick_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_brightness.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_bump.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_camera.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_checker_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_color.h
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_combine_rgb.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_convert_from_color.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_convert_from_float.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_convert_from_int.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_convert_from_normal.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_convert_from_point.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_convert_from_string.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_convert_from_vector.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_emission.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_fresnel.h
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_fresnel.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_gamma.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_geometry.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_glass_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_gradient_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_hair_info.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_holdout.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_hsv.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_image_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_invert.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_layer_weight.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_light_falloff.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_light_path.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_magic_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_mapping.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_math.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_mix.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_mix_closure.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_musgrave_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_noise_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_normal.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_normal_map.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_object_info.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_output_displacement.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_output_surface.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_output_volume.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_particle_info.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_rgb_curves.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_rgb_ramp.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_separate_rgb.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_set_normal.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_tangent.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_texture.h
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_texture_coordinate.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_toon_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_translucent_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_transparent_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_value.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_vector_curves.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_vector_math.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_voronoi_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_ward_bsdf.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_wave_texture.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_wavelength.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_wireframe.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/oslutil.h
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/stdosl.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_attribute.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_brick.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_brightness.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_camera.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_checker.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_convert.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_displace.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_fresnel.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_gamma.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_geometry.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_gradient.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_hsv.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_image.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_invert.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_light_path.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_magic.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_mapping.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_math.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_mix.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_musgrave.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_noisetex.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_normal.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_ramp.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_sky.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_texture.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_value.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_voronoi.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_wave.h
    branches/soc-2013-motion_track/intern/cycles/render/CMakeLists.txt
    branches/soc-2013-motion_track/intern/cycles/render/attribute.cpp
    branches/soc-2013-motion_track/intern/cycles/render/attribute.h
    branches/soc-2013-motion_track/intern/cycles/render/background.cpp
    branches/soc-2013-motion_track/intern/cycles/render/background.h
    branches/soc-2013-motion_track/intern/cycles/render/bssrdf.cpp
    branches/soc-2013-motion_track/intern/cycles/render/bssrdf.h
    branches/soc-2013-motion_track/intern/cycles/render/buffers.cpp
    branches/soc-2013-motion_track/intern/cycles/render/buffers.h
    branches/soc-2013-motion_track/intern/cycles/render/camera.cpp
    branches/soc-2013-motion_track/intern/cycles/render/camera.h
    branches/soc-2013-motion_track/intern/cycles/render/curves.cpp
    branches/soc-2013-motion_track/intern/cycles/render/curves.h
    branches/soc-2013-motion_track/intern/cycles/render/film.cpp
    branches/soc-2013-motion_track/intern/cycles/render/film.h
    branches/soc-2013-motion_track/intern/cycles/render/graph.cpp
    branches/soc-2013-motion_track/intern/cycles/render/graph.h
    branches/soc-2013-motion_track/intern/cycles/render/image.cpp
    branches/soc-2013-motion_track/intern/cycles/render/image.h
    branches/soc-2013-motion_track/intern/cycles/render/integrator.cpp
    branches/soc-2013-motion_track/intern/cycles/render/integrator.h
    branches/soc-2013-motion_track/intern/cycles/render/light.cpp
    branches/soc-2013-motion_track/intern/cycles/render/light.h
    branches/soc-2013-motion_track/intern/cycles/render/mesh.cpp
    branches/soc-2013-motion_track/intern/cycles/render/mesh.h
    branches/soc-2013-motion_track/intern/cycles/render/mesh_displace.cpp
    branches/soc-2013-motion_track/intern/cycles/render/nodes.cpp
    branches/soc-2013-motion_track/intern/cycles/render/nodes.h
    branches/soc-2013-motion_track/intern/cycles/render/object.cpp
    branches/soc-2013-motion_track/intern/cycles/render/object.h
    branches/soc-2013-motion_track/intern/cycles/render/osl.cpp
    branches/soc-2013-motion_track/intern/cycles/render/osl.h
    branches/soc-2013-motion_track/intern/cycles/render/particles.cpp
    branches/soc-2013-motion_track/intern/cycles/render/particles.h
    branches/soc-2013-motion_track/intern/cycles/render/scene.cpp
    branches/soc-2013-motion_track/intern/cycles/render/scene.h
    branches/soc-2013-motion_track/intern/cycles/render/session.cpp
    branches/soc-2013-motion_track/intern/cycles/render/session.h
    branches/soc-2013-motion_track/intern/cycles/render/shader.cpp
    branches/soc-2013-motion_track/intern/cycles/render/shader.h
    branches/soc-2013-motion_track/intern/cycles/render/sobol.h
    branches/soc-2013-motion_track/intern/cycles/render/svm.cpp
    branches/soc-2013-motion_track/intern/cycles/render/svm.h
    branches/soc-2013-motion_track/intern/cycles/render/tables.cpp
    branches/soc-2013-motion_track/intern/cycles/render/tables.h
    branches/soc-2013-motion_track/intern/cycles/render/tile.cpp
    branches/soc-2013-motion_track/intern/cycles/render/tile.h
    branches/soc-2013-motion_track/intern/cycles/subd/subd_build.h
    branches/soc-2013-motion_track/intern/cycles/subd/subd_dice.cpp
    branches/soc-2013-motion_track/intern/cycles/subd/subd_dice.h
    branches/soc-2013-motion_track/intern/cycles/subd/subd_patch.cpp
    branches/soc-2013-motion_track/intern/cycles/subd/subd_patch.h
    branches/soc-2013-motion_track/intern/cycles/subd/subd_split.cpp
    branches/soc-2013-motion_track/intern/cycles/subd/subd_split.h
    branches/soc-2013-motion_track/intern/cycles/subd/subd_stencil.cpp
    branches/soc-2013-motion_track/intern/cycles/util/CMakeLists.txt
    branches/soc-2013-motion_track/intern/cycles/util/util_algorithm.h
    branches/soc-2013-motion_track/intern/cycles/util/util_args.h
    branches/soc-2013-motion_track/intern/cycles/util/util_boundbox.h
    branches/soc-2013-motion_track/intern/cycles/util/util_cache.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_cache.h
    branches/soc-2013-motion_track/intern/cycles/util/util_color.h
    branches/soc-2013-motion_track/intern/cycles/util/util_cuda.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_cuda.h
    branches/soc-2013-motion_track/intern/cycles/util/util_debug.h
    branches/soc-2013-motion_track/intern/cycles/util/util_dynlib.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_dynlib.h
    branches/soc-2013-motion_track/intern/cycles/util/util_foreach.h
    branches/soc-2013-motion_track/intern/cycles/util/util_function.h
    branches/soc-2013-motion_track/intern/cycles/util/util_hash.h
    branches/soc-2013-motion_track/intern/cycles/util/util_image.h
    branches/soc-2013-motion_track/intern/cycles/util/util_list.h
    branches/soc-2013-motion_track/intern/cycles/util/util_map.h
    branches/soc-2013-motion_track/intern/cycles/util/util_math.h
    branches/soc-2013-motion_track/intern/cycles/util/util_opengl.h
    branches/soc-2013-motion_track/intern/cycles/util/util_param.h
    branches/soc-2013-motion_track/intern/cycles/util/util_path.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_path.h
    branches/soc-2013-motion_track/intern/cycles/util/util_progress.h
    branches/soc-2013-motion_track/intern/cycles/util/util_set.h
    branches/soc-2013-motion_track/intern/cycles/util/util_stats.h
    branches/soc-2013-motion_track/intern/cycles/util/util_string.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_string.h
    branches/soc-2013-motion_track/intern/cycles/util/util_system.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_system.h
    branches/soc-2013-motion_track/intern/cycles/util/util_task.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_task.h
    branches/soc-2013-motion_track/intern/cycles/util/util_thread.h
    branches/soc-2013-motion_track/intern/cycles/util/util_time.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_time.h
    branches/soc-2013-motion_track/intern/cycles/util/util_transform.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_transform.h
    branches/soc-2013-motion_track/intern/cycles/util/util_types.h
    branches/soc-2013-motion_track/intern/cycles/util/util_vector.h
    branches/soc-2013-motion_track/intern/cycles/util/util_view.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_view.h
    branches/soc-2013-motion_track/intern/cycles/util/util_xml.h
    branches/soc-2013-motion_track/intern/dualcon/dualcon.h
    branches/soc-2013-motion_track/intern/dualcon/intern/GeoCommon.h
    branches/soc-2013-motion_track/intern/dualcon/intern/MemoryAllocator.h
    branches/soc-2013-motion_track/intern/dualcon/intern/ModelReader.h
    branches/soc-2013-motion_track/intern/dualcon/intern/Projections.cpp
    branches/soc-2013-motion_track/intern/dualcon/intern/Projections.h
    branches/soc-2013-motion_track/intern/dualcon/intern/Queue.h
    branches/soc-2013-motion_track/intern/dualcon/intern/cubes.h
    branches/soc-2013-motion_track/intern/dualcon/intern/dualcon_c_api.cpp
    branches/soc-2013-motion_track/intern/dualcon/intern/manifold_table.h
    branches/soc-2013-motion_track/intern/dualcon/intern/marching_cubes_table.h
    branches/soc-2013-motion_track/intern/dualcon/intern/octree.cpp
    branches/soc-2013-motion_track/intern/dualcon/intern/octree.h
    branches/soc-2013-motion_track/intern/ghost/CMakeLists.txt
    branches/soc-2013-motion_track/intern/ghost/SConscript
    branches/soc-2013-motion_track/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/soc-2013-motion_track/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2013-motion_track/intern/guardedalloc/CMakeLists.txt
    branches/soc-2013-motion_track/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2013-motion_track/intern/guardedalloc/SConscript
    branches/soc-2013-motion_track/intern/guardedalloc/intern/mallocn.c
    branches/soc-2013-motion_track/intern/mikktspace/mikktspace.c
    branches/soc-2013-motion_track/intern/opencolorio/ocio_impl.cc
    branches/soc-2013-motion_track/intern/rigidbody/rb_bullet_api.cpp
    branches/soc-2013-motion_track/release/datafiles/prvicons.png
    branches/soc-2013-motion_track/release/datafiles/prvicons.svg
    branches/soc-2013-motion_track/release/scripts/freestyle/style_modules/parameter_editor.py
    branches/soc-2013-motion_track/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
    branches/soc-2013-motion_track/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2013-motion_track/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/soc-2013-motion_track/release/scripts/modules/bpy/path.py
    branches/soc-2013-motion_track/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2013-motion_track/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2013-motion_track/release/scripts/modules/bpy_types.py
    branches/soc-2013-motion_track/release/scripts/presets/cycles/sampling/final.py
    branches/soc-2013-motion_track/release/scripts/presets/cycles/sampling/preview.py
    branches/soc-2013-motion_track/release/scripts/presets/keyconfig/3dsmax.py
    branches/soc-2013-motion_track/release/scripts/presets/keyconfig/maya.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_operators/wm.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_constraint.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_outliner.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2013-motion_track/release/scripts/startup/nodeitems_builtins.py
    branches/soc-2013-motion_track/release/scripts/templates_py/script_stub.py
    branches/soc-2013-motion_track/source/blender/avi/intern/avi.c
    branches/soc-2013-motion_track/source/blender/avi/intern/avi_mjpeg.c
    branches/soc-2013-motion_track/source/blender/blenfont/BLF_api.h
    branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_anim.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_armature.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_blender.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_curve.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_displist.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_image.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_key.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_mask.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_material.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_mball.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_node.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_object.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_particle.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_screen.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2013-motion_track/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2013-motion_track/source/blender/blenkernel/SConscript
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/action.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/anim.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/armature.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/blender.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/brush.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/camera.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/cloth.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/collision.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/constraint.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/displist.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/effect.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/font.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/image.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/image_gen.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/key.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/lattice.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/library.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/mask.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/material.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/mball.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/modifier.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/multires.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/node.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/object.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/object_deform.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/particle.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/pbvh.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/screen.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/sketch.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/smoke.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/sound.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_array.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_buffer.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_fileops.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_ghash.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_linklist.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_base.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_interp.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_memarena.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_mempool.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_string.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_threads.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_winstuff.h
    branches/soc-2013-motion_track/source/blender/blenlib/CMakeLists.txt
    branches/soc-2013-motion_track/source/blender/blenlib/PIL_time.h
    branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_array.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_linklist.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_memarena.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/buffer.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/edgehash.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/math_geom.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/math_geom_inline.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/scanfill.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/smallhash.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/storage.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/threads.c
    branches/soc-2013-motion_track/source/blender/blenlib/intern/voronoi.c
    branches/soc-2013-motion_track/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-motion_track/source/blender/blenloader/intern/runtime.c
    branches/soc-2013-motion_track/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-motion_track/source/blender/bmesh/CMakeLists.txt
    branches/soc-2013-motion_track/source/blender/bmesh/bmesh.h
    branches/soc-2013-motion_track/source/blender/bmesh/bmesh_class.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_construct.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_core.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_edgeloop.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_edgeloop.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_log.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_log.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_polygon.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_private.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_structure.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_structure.h
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_walkers.c
    branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_bridge.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_connect_nonplanar.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_edgenet.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_fill_edgeloop.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_fill_grid.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_fill_holes.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_normals.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_poke.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_primitive.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_smooth_laplacian.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_split_edges.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_symmetrize.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_triangulate.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_unsubdivide.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_wireframe.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_decimate_collapse.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_edgesplit.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_edgesplit.h
    branches/soc-2013-motion_track/source/blender/collada/MeshImporter.cpp
    branches/soc-2013-motion_track/source/blender/collada/collada.cpp
    branches/soc-2013-motion_track/source/blender/collada/collada_utils.cpp
    branches/soc-2013-motion_track/source/blender/compositor/CMakeLists.txt
    branches/soc-2013-motion_track/source/blender/compositor/COM_compositor.h
    branches/soc-2013-motion_track/source/blender/compositor/intern/COM_Converter.cpp
    branches/soc-2013-motion_track/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2013-motion_track/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/soc-2013-motion_track/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/soc-2013-motion_track/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ImageOperation.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/soc-2013-motion_track/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2013-motion_track/source/blender/editors/armature/armature_select.c
    branches/soc-2013-motion_track/source/blender/editors/armature/armature_skinning.c
    branches/soc-2013-motion_track/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2013-motion_track/source/blender/editors/armature/pose_edit.c
    branches/soc-2013-motion_track/source/blender/editors/armature/pose_transform.c
    branches/soc-2013-motion_track/source/blender/editors/armature/reeb.c
    branches/soc-2013-motion_track/source/blender/editors/curve/editcurve.c
    branches/soc-2013-motion_track/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2013-motion_track/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2013-motion_track/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2013-motion_track/source/blender/editors/include/ED_anim_api.h
    branches/soc-2013-motion_track/source/blender/editors/include/ED_armature.h
    branches/soc-2013-motion_track/source/blender/editors/include/ED_transform.h
    branches/soc-2013-motion_track/source/blender/editors/include/UI_interface.h
    branches/soc-2013-motion_track/source/blender/editors/interface/interface_draw.c
    branches/soc-2013-motion_track/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-motion_track/source/blender/editors/interface/interface_layout.c
    branches/soc-2013-motion_track/source/blender/editors/interface/interface_ops.c
    branches/soc-2013-motion_track/source/blender/editors/interface/interface_templates.c
    branches/soc-2013-motion_track/source/blender/editors/interface/resources.c
    branches/soc-2013-motion_track/source/blender/editors/interface/view2d_ops.c
    branches/soc-2013-motion_track/source/blender/editors/io/io_collada.c
    branches/soc-2013-motion_track/source/blender/editors/mask/mask_draw.c
    branches/soc-2013-motion_track/source/blender/editors/mask/mask_edit.c
    branches/soc-2013-motion_track/source/blender/editors/mask/mask_intern.h
    branches/soc-2013-motion_track/source/blender/editors/mask/mask_ops.c
    branches/soc-2013-motion_track/source/blender/editors/mask/mask_relationships.c
    branches/soc-2013-motion_track/source/blender/editors/mask/mask_select.c
    branches/soc-2013-motion_track/source/blender/editors/mask/mask_shapekey.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editface.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_inset.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_path.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2013-motion_track/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2013-motion_track/source/blender/editors/mesh/meshtools.c
    branches/soc-2013-motion_track/source/blender/editors/metaball/mball_edit.c
    branches/soc-2013-motion_track/source/blender/editors/object/object_add.c
    branches/soc-2013-motion_track/source/blender/editors/object/object_edit.c
    branches/soc-2013-motion_track/source/blender/editors/object/object_group.c
    branches/soc-2013-motion_track/source/blender/editors/object/object_hook.c
    branches/soc-2013-motion_track/source/blender/editors/object/object_modifier.c
    branches/soc-2013-motion_track/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-motion_track/source/blender/editors/render/render_internal.c
    branches/soc-2013-motion_track/source/blender/editors/render/render_opengl.c
    branches/soc-2013-motion_track/source/blender/editors/screen/area.c
    branches/soc-2013-motion_track/source/blender/editors/screen/screen_edit.c
    branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/soc-2013-motion_track/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_utils.c
    branches/soc-2013-motion_track/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-motion_track/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2013-motion_track/source/blender/editors/space_clip/tracking_select.c
    branches/soc-2013-motion_track/source/blender/editors/space_file/file_panels.c
    branches/soc-2013-motion_track/source/blender/editors/space_file/space_file.c
    branches/soc-2013-motion_track/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2013-motion_track/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2013-motion_track/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-motion_track/source/blender/editors/space_image/space_image.c
    branches/soc-2013-motion_track/source/blender/editors/space_info/info_stats.c
    branches/soc-2013-motion_track/source/blender/editors/space_logic/logic_window.c
    branches/soc-2013-motion_track/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2013-motion_track/source/blender/editors/space_node/drawnode.c
    branches/soc-2013-motion_track/source/blender/editors/space_node/node_add.c
    branches/soc-2013-motion_track/source/blender/editors/space_node/node_edit.c
    branches/soc-2013-motion_track/source/blender/editors/space_node/node_relationships.c
    branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2013-motion_track/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2013-motion_track/source/blender/editors/space_time/space_time.c
    branches/soc-2013-motion_track/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2013-motion_track/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-motion_track/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2013-motion_track/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_iterators.c
    branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2013-motion_track/source/blender/editors/transform/transform.c
    branches/soc-2013-motion_track/source/blender/editors/transform/transform.h
    branches/soc-2013-motion_track/source/blender/editors/transform/transform_constraints.c
    branches/soc-2013-motion_track/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-motion_track/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-motion_track/source/blender/editors/transform/transform_snap.c
    branches/soc-2013-motion_track/source/blender/editors/util/crazyspace.c
    branches/soc-2013-motion_track/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2013-motion_track/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2013-motion_track/source/blender/freestyle/intern/application/AppView.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/application/Controller.cpp
    branches/soc-2013-motion_track/source/blender/freestyle/intern/application/Controller.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/BBox.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/FastGrid.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/FitCurve.cpp
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/Grid.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/Noise.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/Polygon.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/SweepLine.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/VecMat.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/geometry/normal_cycle.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/image/GaussianFilter.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/image/Image.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
    branches/soc-2013-motion_track/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
    branches/soc-2013-motion_track/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/scene_graph/LineRep.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/scene_graph/Node.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/scene_graph/NodeCamera.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/Module.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/Operators.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/Predicates0D.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/Stroke.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/StrokeRenderer.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/StrokeRep.cpp
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/StrokeRep.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/StrokeShader.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/StrokeTesselator.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/StyleModule.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/BaseIterator.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/BaseObject.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/Exception.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/Id.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/Interpreter.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/ProgressBar.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/PseudoNoise.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/RandGen.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/RenderMonitor.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/TimeStamp.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/system/TimeUtils.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/BoxGrid.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/Functions1D.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/GridDensityProvider.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/Interface1D.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/OccluderSource.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/SphericalGrid.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/SteerableViewMap.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewMap.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewMapIterators.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/winged_edge/WEdge.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/winged_edge/WFillGrid.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/winged_edge/WXEdge.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
    branches/soc-2013-motion_track/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
    branches/soc-2013-motion_track/source/blender/gpu/GPU_buffers.h
    branches/soc-2013-motion_track/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2013-motion_track/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2013-motion_track/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    branches/soc-2013-motion_track/source/blender/imbuf/intern/bmp.c
    branches/soc-2013-motion_track/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2013-motion_track/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_ID.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_image_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_key_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_meta_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_node_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_object_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_sound_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_space_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2013-motion_track/source/blender/makesdna/intern/CMakeLists.txt
    branches/soc-2013-motion_track/source/blender/makesdna/intern/SConscript
    branches/soc-2013-motion_track/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2013-motion_track/source/blender/makesrna/SConscript
    branches/soc-2013-motion_track/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2013-motion_track/source/blender/makesrna/intern/SConscript
    branches/soc-2013-motion_track/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_define.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_render.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_laplaciansmooth.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_ocean.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_triangulate.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2013-motion_track/source/blender/nodes/CMakeLists.txt
    branches/soc-2013-motion_track/source/blender/nodes/NOD_composite.h
    branches/soc-2013-motion_track/source/blender/nodes/NOD_shader.h
    branches/soc-2013-motion_track/source/blender/nodes/NOD_static_types.h
    branches/soc-2013-motion_track/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_light_path.c
    branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
    branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_ops.c
    branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2013-motion_track/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2013-motion_track/source/blender/python/intern/bpy_rna.c
    branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2013-motion_track/source/blender/render/intern/include/zbuf.h
    branches/soc-2013-motion_track/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2013-motion_track/source/blender/render/intern/source/bake.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/envmap.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/initrender.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/multires_bake.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/occlusion.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/pointdensity.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/rayshade.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/render_result.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/render_texture.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/shadbuf.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/strand.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/voxeldata.c
    branches/soc-2013-motion_track/source/blender/render/intern/source/zbuf.c
    branches/soc-2013-motion_track/source/blender/windowmanager/WM_api.h
    branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm.c
    branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2013-motion_track/source/creator/creator.c
    branches/soc-2013-motion_track/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2013-motion_track/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2013-motion_track/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2013-motion_track/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/soc-2013-motion_track/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2013-motion_track/source/gameengine/Converter/BL_ArmatureObject.h
    branches/soc-2013-motion_track/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2013-motion_track/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2013-motion_track/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2013-motion_track/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2013-motion_track/source/gameengine/GameLogic/SCA_IScene.cpp
    branches/soc-2013-motion_track/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2013-motion_track/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_Action.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_ActionManager.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_ActionManager.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Light.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_RaySensor.h
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/soc-2013-motion_track/source/gameengine/SceneGraph/SG_Tree.cpp
    branches/soc-2013-motion_track/source/gameengine/VideoTexture/BlendType.h
    branches/soc-2013-motion_track/source/gameengine/VideoTexture/Exception.cpp
    branches/soc-2013-motion_track/source/gameengine/VideoTexture/FilterSource.h
    branches/soc-2013-motion_track/source/gameengine/VideoTexture/ImageMix.h
    branches/soc-2013-motion_track/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2013-motion_track/source/tools/check_style_c.py

Added Paths:
-----------
    branches/soc-2013-motion_track/intern/atomic/
    branches/soc-2013-motion_track/intern/cycles/kernel/kernel_bvh_subsurface.h
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_blackbody.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_combine_hsv.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_separate_hsv.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_vector_transform.osl
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_blackbody.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
    branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_vector_transform.h
    branches/soc-2013-motion_track/intern/cycles/render/blackbody.cpp
    branches/soc-2013-motion_track/intern/cycles/render/blackbody.h
    branches/soc-2013-motion_track/release/text/GPL3-license.txt
    branches/soc-2013-motion_track/release/text/jemalloc-license.txt
    branches/soc-2013-motion_track/source/blender/blenkernel/BKE_treehash.h
    branches/soc-2013-motion_track/source/blender/blenkernel/intern/treehash.c
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_linklist_stack.h
    branches/soc-2013-motion_track/source/blender/blenlib/BLI_sort.h
    branches/soc-2013-motion_track/source/blender/blenlib/intern/sort.c
    branches/soc-2013-motion_track/source/blender/bmesh/bmesh_tools.h
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_bisect_plane.c
    branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_fill_attribute.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_bisect_plane.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_bisect_plane.h
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_edgenet.c
    branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_edgenet.h
    branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
    branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_SplitOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_SplitOperation.h
    branches/soc-2013-motion_track/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
    branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_blackbody.c
    branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
    branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_vectTransform.c

Removed Paths:
-------------
    branches/soc-2013-motion_track/intern/cycles/doc/license/Blender.txt
    branches/soc-2013-motion_track/intern/cycles/doc/license/GPL.txt
    branches/soc-2013-motion_track/intern/cycles/util/util_memarena.cpp
    branches/soc-2013-motion_track/intern/cycles/util/util_memarena.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_SplitViewerOperation.h
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ViewerBaseOperation.h

Property Changed:
----------------
    branches/soc-2013-motion_track/
    branches/soc-2013-motion_track/source/blender/editors/interface/interface.c
    branches/soc-2013-motion_track/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-motion_track
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57391-58769
   + /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57391-59488

Modified: branches/soc-2013-motion_track/CMakeLists.txt
===================================================================
--- branches/soc-2013-motion_track/CMakeLists.txt	2013-08-24 22:06:36 UTC (rev 59488)
+++ branches/soc-2013-motion_track/CMakeLists.txt	2013-08-24 22:58:20 UTC (rev 59489)
@@ -416,6 +416,10 @@
 	set(WITH_HEADLESS ON)
 endif()
 
+if(NOT WITH_PYTHON)
+	set(WITH_CYCLES OFF)
+endif()
+
 # enable boost for cycles, booleans, audaspace or i18n
 # otherwise if the user disabled
 if(NOT WITH_BOOST)

Modified: branches/soc-2013-motion_track/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-motion_track/build_files/build_environment/install_deps.sh	2013-08-24 22:06:36 UTC (rev 59488)
+++ branches/soc-2013-motion_track/build_files/build_environment/install_deps.sh	2013-08-24 22:58:20 UTC (rev 59489)
@@ -212,6 +212,7 @@
 OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false
+_need_openexr_ldconfig=false
 
 OIIO_VERSION="1.1.10"
 OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
@@ -230,6 +231,7 @@
 
 # OSL needs to be compiled for now!
 OSL_VERSION="1.3.2"
+OSL_VERSION_MIN=$OSL_VERSION
 OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
@@ -237,6 +239,7 @@
 # Version??
 OPENCOLLADA_VERSION="1.3"
 OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
+OPENCOLLADA_REPO_UID="828b60384552b83e55d2af7055f07d2c40b4d3f4"
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
 
@@ -1632,7 +1635,7 @@
 
 compile_OpenCOLLADA() {
   # To be changed each time we make edits that would modify the compiled results!
-  opencollada_magic=6
+  opencollada_magic=7
   _init_opencollada
 
   # Clean install if needed!
@@ -1657,7 +1660,7 @@
     git pull origin master
 
     # Stick to same rev as windows' libs...
-    git checkout e886e196673222f2f4bc32b936dc96419fff815f
+    git checkout $OPENCOLLADA_REPO_UID
     git reset --hard
 
     # Always refresh the whole build!
@@ -2775,7 +2778,7 @@
       if [ $? -eq 0 ]; then
         install_packages_ARCH llvm clang
         have_llvm=true
-        LLVM_VERSION=`check_package_version_ge_ARCH llvm`
+        LLVM_VERSION=`check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN`
         LLVM_VERSION_FOUND=$LLVM_VERSION
         clean_LLVM
       else

Modified: branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_cppcheck.py	2013-08-24 22:06:36 UTC (rev 59488)
+++ branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_cppcheck.py	2013-08-24 22:58:20 UTC (rev 59489)
@@ -52,6 +52,7 @@
 
 def main():
     source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+    source_defines = project_source_info.build_defines_as_args()
 
     check_commands = []
     for c, inc_dirs, defs in source_info:
@@ -59,7 +60,8 @@
                CHECKER_ARGS +
                [c] +
                [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
+               [("-D%s" % d) for d in defs] +
+               source_defines
                )
 
         check_commands.append((c, cmd))

Modified: branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_smatch.py
===================================================================
--- branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_smatch.py	2013-08-24 22:06:36 UTC (rev 59488)
+++ branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_smatch.py	2013-08-24 22:58:20 UTC (rev 59489)
@@ -44,6 +44,7 @@
 
 def main():
     source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+    source_defines = project_source_info.build_defines_as_args()
 
     check_commands = []
     for c, inc_dirs, defs in source_info:
@@ -52,7 +53,8 @@
                CHECKER_ARGS +
                [c] +
                [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
+               [("-D%s" % d) for d in defs] +
+               source_defines
                )
 
         check_commands.append((c, cmd))

Modified: branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_sparse.py	2013-08-24 22:06:36 UTC (rev 59488)
+++ branches/soc-2013-motion_track/build_files/cmake/cmake_static_check_sparse.py	2013-08-24 22:58:20 UTC (rev 59489)
@@ -42,6 +42,7 @@
 
 def main():
     source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+    source_defines = project_source_info.build_defines_as_args()
 
     check_commands = []
     for c, inc_dirs, defs in source_info:
@@ -50,7 +51,8 @@
                CHECKER_ARGS +
                [c] +
                [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
+               [("-D%s" % d) for d in defs] +
+               source_defines
                )
 
         check_commands.append((c, cmd))

Modified: branches/soc-2013-motion_track/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-motion_track/build_files/cmake/macros.cmake	2013-08-24 22:06:36 UTC (rev 59488)
+++ branches/soc-2013-motion_track/build_files/cmake/macros.cmake	2013-08-24 22:58:20 UTC (rev 59489)
@@ -799,4 +799,35 @@
 	unset(_file_from)
 	unset(_file_to)
 	unset(_file_to_path)
+
 endmacro()
+
+macro(svg_to_png
+      file_from
+      file_to
+      dpi
+      list_to_add)
+
+	# remove ../'s
+	get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
+	get_filename_component(_file_to   ${CMAKE_CURRENT_SOURCE_DIR}/${file_to}   REALPATH)
+
+	list(APPEND ${list_to_add} ${_file_to})
+
+	find_program(INKSCAPE_EXE inkscape)
+	mark_as_advanced(INKSCAPE_EXE)
+
+	if(INKSCAPE_EXE)
+		add_custom_command(
+			OUTPUT  ${_file_to}
+			COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi}  --without-gui --export-png=${_file_to}
+			DEPENDS ${_file_from} ${INKSCAPE_EXE}
+		)
+	else()
+		message(WARNING "Inkscape not found, could not re-generate ${_file_to} from ${_file_from}!")
+	endif()
+
+	unset(_file_from)
+	unset(_file_to)
+
+endmacro()
\ No newline at end of file

Modified: branches/soc-2013-motion_track/build_files/cmake/project_source_info.py
===================================================================
--- branches/soc-2013-motion_track/build_files/cmake/project_source_info.py	2013-08-24 22:06:36 UTC (rev 59488)
+++ branches/soc-2013-motion_track/build_files/cmake/project_source_info.py	2013-08-24 22:58:20 UTC (rev 59489)
@@ -171,6 +171,26 @@
     return source
 
 
+def build_defines_as_source():
+    """
+    Returns a string formatted as an include:
+        '#defines A=B\n#define....'
+    """
+    import subprocess
+    # works for both gcc and clang
+    cmd = (cmake_cache_var("CMAKE_C_COMPILER"), "-dM", "-E", "-")
+    return subprocess.Popen(cmd,
+                            stdout=subprocess.PIPE,
+                            stdin=subprocess.DEVNULL,
+                            ).stdout.read().strip().decode('ascii')
+
+
+def build_defines_as_args():
+    return [("-D" + "=".join(l.split(maxsplit=2)[1:]))
+            for l in build_defines_as_source().split("\n")
+            if l.startswith('#define')]
+
+
 # could be moved elsewhere!, this just happens to be used by scripts that also
 # use this module.
 def queue_processes(process_funcs, job_total=-1):

Modified: branches/soc-2013-motion_track/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2013-motion_track/build_files/scons/tools/Blender.py	2013-08-24 22:06:36 UTC (rev 59488)
+++ branches/soc-2013-motion_track/build_files/scons/tools/Blender.py	2013-08-24 22:58:20 UTC (rev 59489)
@@ -151,12 +151,6 @@
         libincs += Split(lenv['BF_JACK_LIBPATH'])
     if lenv['WITH_BF_SNDFILE']:
         libincs += Split(lenv['BF_SNDFILE_LIBPATH'])

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list