[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59850] branches/soc-2013-motion_track: Merging from trunk r59849 into soc-2013-motion_track
Joseph Mansfield
sftrabbit at gmail.com
Thu Sep 5 19:56:21 CEST 2013
Revision: 59850
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59850
Author: sftrabbit
Date: 2013-09-05 17:56:20 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Merging from trunk r59849 into soc-2013-motion_track
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59849
Modified Paths:
--------------
branches/soc-2013-motion_track/CMakeLists.txt
branches/soc-2013-motion_track/GNUmakefile
branches/soc-2013-motion_track/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2013-motion_track/build_files/cmake/macros.cmake
branches/soc-2013-motion_track/build_files/scons/config/freebsd8-config.py
branches/soc-2013-motion_track/build_files/scons/config/freebsd9-config.py
branches/soc-2013-motion_track/build_files/scons/config/linux-config.py
branches/soc-2013-motion_track/build_files/scons/tools/btools.py
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/CMakeLists.txt
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/ChangeLog
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/SConscript
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/bundle.sh
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/files.txt
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/ceres.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/cost_function.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/jet.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/loss_function.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/problem.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/solver.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/types.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/blas.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/corrector.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/cxsparse.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/line_search.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/line_search.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/preconditioner.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/problem.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/solver.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/split.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/types.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/wall_time.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/wall_time.h
branches/soc-2013-motion_track/intern/atomic/atomic_ops.h
branches/soc-2013-motion_track/intern/cycles/CMakeLists.txt
branches/soc-2013-motion_track/intern/cycles/SConscript
branches/soc-2013-motion_track/intern/cycles/app/CMakeLists.txt
branches/soc-2013-motion_track/intern/cycles/app/cycles_xml.cpp
branches/soc-2013-motion_track/intern/cycles/blender/CMakeLists.txt
branches/soc-2013-motion_track/intern/cycles/blender/addon/ui.py
branches/soc-2013-motion_track/intern/cycles/blender/blender_session.cpp
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/cmake/external_libs.cmake
branches/soc-2013-motion_track/intern/cycles/device/device.cpp
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_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/kernel/closure/bsdf.h
branches/soc-2013-motion_track/intern/cycles/kernel/closure/bssrdf.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_compat_cuda.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_film.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_path.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_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_services.cpp
branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_shader.cpp
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/stdosl.h
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm.h
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_sky.h
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-motion_track/intern/cycles/render/CMakeLists.txt
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/image.cpp
branches/soc-2013-motion_track/intern/cycles/render/integrator.cpp
branches/soc-2013-motion_track/intern/cycles/render/mesh.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/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/svm.cpp
branches/soc-2013-motion_track/intern/cycles/render/svm.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/util/CMakeLists.txt
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_types.h
branches/soc-2013-motion_track/intern/elbeem/CMakeLists.txt
branches/soc-2013-motion_track/intern/ghost/SConscript
branches/soc-2013-motion_track/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2013-motion_track/intern/ghost/intern/GHOST_EventManager.cpp
branches/soc-2013-motion_track/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2013-motion_track/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/soc-2013-motion_track/intern/ghost/intern/GHOST_WindowSDL.h
branches/soc-2013-motion_track/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-motion_track/intern/ghost/test/CMakeLists.txt
branches/soc-2013-motion_track/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-motion_track/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-motion_track/intern/guardedalloc/intern/mmap_win.c
branches/soc-2013-motion_track/intern/guardedalloc/mmap_win.h
branches/soc-2013-motion_track/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2013-motion_track/intern/opencolorio/fallback_impl.cc
branches/soc-2013-motion_track/intern/opencolorio/ocio_capi.cc
branches/soc-2013-motion_track/intern/opencolorio/ocio_capi.h
branches/soc-2013-motion_track/intern/opencolorio/ocio_impl.h
branches/soc-2013-motion_track/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2013-motion_track/intern/tools/bpy_introspect_ui.py
branches/soc-2013-motion_track/release/datafiles/blender_icons.sh
branches/soc-2013-motion_track/release/datafiles/blender_icons.svg
branches/soc-2013-motion_track/release/datafiles/blender_icons16.png
branches/soc-2013-motion_track/release/datafiles/blender_icons32.png
branches/soc-2013-motion_track/release/datafiles/prvicons.png
branches/soc-2013-motion_track/release/datafiles/prvicons.sh
branches/soc-2013-motion_track/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-motion_track/release/scripts/modules/addon_utils.py
branches/soc-2013-motion_track/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2013-motion_track/release/scripts/modules/rna_info.py
branches/soc-2013-motion_track/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/__init__.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/node.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/__init__.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_paint_common.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/space_dopesheet.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_node.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/templates_py/ui_list.py
branches/soc-2013-motion_track/source/CMakeLists.txt
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_brush.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_editmesh_bvh.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_idprop.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_lamp.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_library.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_pbvh.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_report.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_text.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_tracking.h
branches/soc-2013-motion_track/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/blender.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/boids.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/brush.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/cdderivedmesh.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/context.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/curve.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/editmesh.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/editmesh_bvh.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/group.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/image.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/key.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/mask_rasterize.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/node.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/object.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/pbvh_intern.h
branches/soc-2013-motion_track/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/property.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/sca.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/scene.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/smoke.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/text.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/treehash.c
branches/soc-2013-motion_track/source/blender/blenlib/BLI_callbacks.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_dynstr.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_endian_switch.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_jitter.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_kdtree.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_lasso.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_listbase.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_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_path_util.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_smallhash.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_string.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_utildefines.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_ghash.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_kdtree.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/boxpack2d.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/fileops.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/gsqueue.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/lasso.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/listbase.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/path_util.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/quadric.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/rand.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/blenloader/intern/readblenentry.c
branches/soc-2013-motion_track/source/blender/blenloader/intern/readfile.c
branches/soc-2013-motion_track/source/blender/blenloader/intern/undofile.c
branches/soc-2013-motion_track/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-motion_track/source/blender/blenloader/intern/writefile.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_inline.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_walkers.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_removedoubles.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/tools/bmesh_bisect_plane.c
branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-motion_track/source/blender/collada/CameraExporter.cpp
branches/soc-2013-motion_track/source/blender/collada/CameraExporter.h
branches/soc-2013-motion_track/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-motion_track/source/blender/compositor/CMakeLists.txt
branches/soc-2013-motion_track/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2013-motion_track/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ColorRampNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_RenderLayersNode.h
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_TranslateNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.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_ScreenLensDistortionOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_WrapOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_WrapOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2013-motion_track/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-motion_track/source/blender/editors/animation/anim_filter.c
branches/soc-2013-motion_track/source/blender/editors/animation/drivers.c
branches/soc-2013-motion_track/source/blender/editors/animation/keyframing.c
branches/soc-2013-motion_track/source/blender/editors/curve/curve_intern.h
branches/soc-2013-motion_track/source/blender/editors/curve/curve_ops.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/include/ED_clip.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_curve.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_keyframing.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_mask.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_object.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_screen_types.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_uvedit.h
branches/soc-2013-motion_track/source/blender/editors/include/UI_icons.h
branches/soc-2013-motion_track/source/blender/editors/include/UI_interface.h
branches/soc-2013-motion_track/source/blender/editors/include/UI_resources.h
branches/soc-2013-motion_track/source/blender/editors/include/UI_view2d.h
branches/soc-2013-motion_track/source/blender/editors/interface/interface.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_intern.h
branches/soc-2013-motion_track/source/blender/editors/interface/interface_layout.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_regions.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_templates.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-motion_track/source/blender/editors/interface/resources.c
branches/soc-2013-motion_track/source/blender/editors/interface/view2d.c
branches/soc-2013-motion_track/source/blender/editors/mask/mask_add.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/mesh/CMakeLists.txt
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_knife.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/metaball/mball_edit.c
branches/soc-2013-motion_track/source/blender/editors/object/object_edit.c
branches/soc-2013-motion_track/source/blender/editors/object/object_relations.c
branches/soc-2013-motion_track/source/blender/editors/object/object_transform.c
branches/soc-2013-motion_track/source/blender/editors/physics/particle_edit.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/render/render_preview.c
branches/soc-2013-motion_track/source/blender/editors/screen/area.c
branches/soc-2013-motion_track/source/blender/editors/screen/glutil.c
branches/soc-2013-motion_track/source/blender/editors/screen/screen_edit.c
branches/soc-2013-motion_track/source/blender/editors/screen/screen_ops.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.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_ops.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/space_clip/clip_buttons.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_editor.c
branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_graph_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/filelist.c
branches/soc-2013-motion_track/source/blender/editors/space_file/filesel.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_edit.c
branches/soc-2013-motion_track/source/blender/editors/space_graph/graph_select.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_logic/logic_window.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_buttons.c
branches/soc-2013-motion_track/source/blender/editors/space_node/node_draw.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_intern.h
branches/soc-2013-motion_track/source/blender/editors/space_node/node_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_node/node_relationships.c
branches/soc-2013-motion_track/source/blender/editors/space_node/node_select.c
branches/soc-2013-motion_track/source/blender/editors/space_node/node_view.c
branches/soc-2013-motion_track/source/blender/editors/space_node/space_node.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_tools.c
branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-motion_track/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-motion_track/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2013-motion_track/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2013-motion_track/source/blender/editors/space_text/text_draw.c
branches/soc-2013-motion_track/source/blender/editors/space_text/text_intern.h
branches/soc-2013-motion_track/source/blender/editors/space_text/text_ops.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/view3d_edit.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform_generics.c
branches/soc-2013-motion_track/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-motion_track/source/blender/editors/uvedit/uvedit_ops.c
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_codegen.c
branches/soc-2013-motion_track/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-motion_track/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-motion_track/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-motion_track/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-motion_track/source/blender/imbuf/intern/divers.c
branches/soc-2013-motion_track/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-motion_track/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_modifier_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_screen_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2013-motion_track/source/blender/makesdna/intern/SConscript
branches/soc-2013-motion_track/source/blender/makesrna/RNA_access.h
branches/soc-2013-motion_track/source/blender/makesrna/RNA_types.h
branches/soc-2013-motion_track/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_object.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_rna.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_array.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_boolean_util.h
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_weightvgproximity.c
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_texture.h
branches/soc-2013-motion_track/source/blender/nodes/intern/node_util.c
branches/soc-2013-motion_track/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2013-motion_track/source/blender/nodes/shader/node_shader_util.c
branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-motion_track/source/blender/python/intern/bpy_interface.c
branches/soc-2013-motion_track/source/blender/python/intern/bpy_rna.c
branches/soc-2013-motion_track/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-motion_track/source/blender/render/intern/source/pipeline.c
branches/soc-2013-motion_track/source/blender/render/intern/source/render_result.c
branches/soc-2013-motion_track/source/blender/render/intern/source/rendercore.c
branches/soc-2013-motion_track/source/blender/render/intern/source/shadeoutput.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/WM_types.h
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-motion_track/source/blenderplayer/bad_level_call_stubs/stubs.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_BlenderDataConversion.cpp
branches/soc-2013-motion_track/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2013-motion_track/source/gameengine/Converter/KX_ConvertActuators.h
branches/soc-2013-motion_track/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2013-motion_track/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2013-motion_track/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.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/KX_PythonInit.cpp
branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_MeshObject.cpp
Added Paths:
-----------
branches/soc-2013-motion_track/doc/python_api/examples/bpy.types.UIList.1.py
branches/soc-2013-motion_track/doc/python_api/examples/bpy.types.UIList.2.py
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/c_api.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/covariance.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/blas.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/c_api.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/covariance.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/lapack.cc
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/lapack.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/small_blas.h
branches/soc-2013-motion_track/intern/cycles/app/cycles_standalone.cpp
branches/soc-2013-motion_track/intern/cycles/render/sky_model.cpp
branches/soc-2013-motion_track/intern/cycles/render/sky_model.h
branches/soc-2013-motion_track/intern/cycles/render/sky_model_data.h
branches/soc-2013-motion_track/intern/ghost/test/multitest/stubs.c
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/mask.py
branches/soc-2013-motion_track/release/scripts/templates_py/ui_list_simple.py
branches/soc-2013-motion_track/source/blender/blenlib/BLI_compiler_attrs.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_strict_flags.h
branches/soc-2013-motion_track/source/blender/blenlib/PIL_time_utildefines.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersProg.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersProg.h
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_bisect.c
Removed Paths:
-------------
branches/soc-2013-motion_track/build_files/scons/config/freebsd7-config.py
branches/soc-2013-motion_track/doc/python_api/examples/bpy.types.UIList.py
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h
branches/soc-2013-motion_track/intern/cycles/app/cycles_test.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixAddOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixValueOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersAOOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersColorOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersDepthProg.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersImageProg.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_RenderLayersUVOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_SeparateChannelOperation.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,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
+ /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,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57391-59849
Modified: branches/soc-2013-motion_track/CMakeLists.txt
===================================================================
--- branches/soc-2013-motion_track/CMakeLists.txt 2013-09-05 17:25:26 UTC (rev 59849)
+++ branches/soc-2013-motion_track/CMakeLists.txt 2013-09-05 17:56:20 UTC (rev 59850)
@@ -261,7 +261,8 @@
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
-option(WITH_CYCLES_TEST "Build cycles test application" OFF)
+option(WITH_CYCLES_STANDALONE "Build cycles standalone application" OFF)
+option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
@@ -373,7 +374,7 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
-if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_TEST)
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_STANDALONE)
message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
endif()
@@ -771,14 +772,14 @@
endif()
if(LLVM_DIRECTORY)
- FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+ find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
if(NOT LLVM_CONFIG)
- FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+ find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
endif()
else()
- FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION})
+ find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION})
if(NOT LLVM_CONFIG)
- FIND_PROGRAM(LLVM_CONFIG llvm-config)
+ find_program(LLVM_CONFIG llvm-config)
endif()
endif()
execute_process(COMMAND ${LLVM_CONFIG} --version
@@ -881,8 +882,6 @@
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE)
- # BSD's dont use libdl.so
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
@@ -2145,6 +2144,23 @@
set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
set(CMAKE_CXX_FLAGS "${CXX_WARNINGS} ${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS}")
+# defined above, platform spesific but shared names
+mark_as_advanced(
+ CYCLES_OSL
+ OSL_LIB_EXEC
+ OSL_COMPILER
+ OSL_LIB_COMP
+ OSL_LIB_QUERY
+ OSL_INCLUDES
+)
+
+mark_as_advanced(
+ LLVM_CONFIG
+ LLVM_DIRECTORY
+ LLVM_LIBRARY
+ LLVM_VERSION
+)
+
#-------------------------------------------------------------------------------
# Global Defines
Modified: branches/soc-2013-motion_track/GNUmakefile
===================================================================
--- branches/soc-2013-motion_track/GNUmakefile 2013-09-05 17:25:26 UTC (rev 59849)
+++ branches/soc-2013-motion_track/GNUmakefile 2013-09-05 17:56:20 UTC (rev 59850)
@@ -184,6 +184,7 @@
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
@echo "Utilities (not associated with building blender)"
+ @echo " * icons - updates PNG icons from SVG files."
@echo " * tbz - create a compressed svn export 'blender_archive.tar.bz2'"
@echo ""
@echo "Documentation Targets (not associated with building blender)"
@@ -322,7 +323,11 @@
rm -rf blender_archive/
@echo "blender_archive.tar.bz2 written"
+icons:
+ $(BLENDER_DIR)/release/datafiles/blender_icons.sh
+ $(BLENDER_DIR)/release/datafiles/prvicons.sh
+
# -----------------------------------------------------------------------------
# Documentation
#
Modified: branches/soc-2013-motion_track/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2013-motion_track/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-09-05 17:25:26 UTC (rev 59849)
+++ branches/soc-2013-motion_track/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-09-05 17:56:20 UTC (rev 59850)
@@ -199,4 +199,5 @@
PYTHON_INCLUDE_DIR
PYTHON_INCLUDE_CONFIG_DIR
PYTHON_LIBRARY
+ PYTHON_LIBPATH
)
Modified: branches/soc-2013-motion_track/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-motion_track/build_files/cmake/macros.cmake 2013-09-05 17:25:26 UTC (rev 59849)
+++ branches/soc-2013-motion_track/build_files/cmake/macros.cmake 2013-09-05 17:56:20 UTC (rev 59850)
@@ -387,7 +387,7 @@
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
- target_link_libraries(${target} ${PLATFORM_LINKLIBS})
+ target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
endmacro()
macro(TEST_SSE_SUPPORT
@@ -802,6 +802,7 @@
endmacro()
+# XXX Not used for now...
macro(svg_to_png
file_from
file_to
@@ -818,6 +819,15 @@
mark_as_advanced(INKSCAPE_EXE)
if(INKSCAPE_EXE)
+ if(APPLE)
+ # in OS X app bundle, the binary is a shim that doesn't take any
+ # command line arguments, replace it with the actual binary
+ string(REPLACE "MacOS/Inkscape" "Resources/bin/inkscape" INKSCAPE_REAL_EXE ${INKSCAPE_EXE})
+ if(EXISTS "${INKSCAPE_REAL_EXE}")
+ set(INKSCAPE_EXE ${INKSCAPE_REAL_EXE})
+ endif()
+ endif()
+
add_custom_command(
OUTPUT ${_file_to}
COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
@@ -830,4 +840,4 @@
unset(_file_from)
unset(_file_to)
-endmacro()
\ No newline at end of file
+endmacro()
Deleted: branches/soc-2013-motion_track/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2013-motion_track/build_files/scons/config/freebsd7-config.py 2013-09-05 17:25:26 UTC (rev 59849)
+++ branches/soc-2013-motion_track/build_files/scons/config/freebsd7-config.py 2013-09-05 17:56:20 UTC (rev 59850)
@@ -1,210 +0,0 @@
-CC = 'gcc44'
-CXX = 'g++44'
-
-LCGDIR = '../lib/freebsd7'
-LIBDIR = "${LCGDIR}"
-
-BF_PYTHON_ABI_FLAGS = ''
-BF_PYTHON = '/usr/local'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.3'
-WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
-BF_OPENAL = '/usr/local'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-BF_CXX = '/usr/local'
-WITH_BF_STATICCXX = False
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-WITH_BF_JACK = True
-BF_JACK = '/usr/local'
-BF_JACK_INC = '${BF_JACK}/include/jack'
-BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = True
-BF_SNDFILE = '/usr/local'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = '/usr/local'
-# when compiling with your own openexr lib you might need to set...
-# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list