diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 16:22:27 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 17:39:13 +0300 |
commit | ba432299cdd4382130103cf5a84c34693d4a3bdc (patch) | |
tree | 8d31ffec1aad8f9216aa1fc7108f494b65f74e7e | |
parent | 6fb6a08bf84d5d16ebac35527a77bec37112494e (diff) |
Move Libmv from extern/ to intern/
Logically it is intern library since being mainly developed by 1.5 blender guys.
-rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
-rw-r--r-- | extern/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/libmv/CMakeLists.txt (renamed from extern/libmv/CMakeLists.txt) | 20 | ||||
-rw-r--r-- | intern/libmv/ChangeLog (renamed from extern/libmv/ChangeLog) | 0 | ||||
-rwxr-xr-x | intern/libmv/bundle.sh (renamed from extern/libmv/bundle.sh) | 20 | ||||
-rw-r--r-- | intern/libmv/files.txt (renamed from extern/libmv/files.txt) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/autotrack.cc (renamed from extern/libmv/intern/autotrack.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/autotrack.h (renamed from extern/libmv/intern/autotrack.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/camera_intrinsics.cc (renamed from extern/libmv/intern/camera_intrinsics.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/camera_intrinsics.h (renamed from extern/libmv/intern/camera_intrinsics.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/detector.cc (renamed from extern/libmv/intern/detector.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/detector.h (renamed from extern/libmv/intern/detector.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/frame_accessor.cc (renamed from extern/libmv/intern/frame_accessor.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/frame_accessor.h (renamed from extern/libmv/intern/frame_accessor.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/homography.cc (renamed from extern/libmv/intern/homography.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/homography.h (renamed from extern/libmv/intern/homography.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/image.cc (renamed from extern/libmv/intern/image.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/image.h (renamed from extern/libmv/intern/image.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/logging.cc (renamed from extern/libmv/intern/logging.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/logging.h (renamed from extern/libmv/intern/logging.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/reconstruction.cc (renamed from extern/libmv/intern/reconstruction.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/reconstruction.h (renamed from extern/libmv/intern/reconstruction.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/region.h (renamed from extern/libmv/intern/region.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/stub.cc (renamed from extern/libmv/intern/stub.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/track_region.cc (renamed from extern/libmv/intern/track_region.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/track_region.h (renamed from extern/libmv/intern/track_region.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/tracks.cc (renamed from extern/libmv/intern/tracks.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/tracks.h (renamed from extern/libmv/intern/tracks.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/tracksN.cc (renamed from extern/libmv/intern/tracksN.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/tracksN.h (renamed from extern/libmv/intern/tracksN.h) | 0 | ||||
-rw-r--r-- | intern/libmv/intern/utildefines.h (renamed from extern/libmv/intern/utildefines.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv-capi.h (renamed from extern/libmv/libmv-capi.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/autotrack.cc (renamed from extern/libmv/libmv/autotrack/autotrack.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/autotrack.h (renamed from extern/libmv/libmv/autotrack/autotrack.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/callbacks.h (renamed from extern/libmv/libmv/autotrack/callbacks.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/frame_accessor.h (renamed from extern/libmv/libmv/autotrack/frame_accessor.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/marker.h (renamed from extern/libmv/libmv/autotrack/marker.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/model.h (renamed from extern/libmv/libmv/autotrack/model.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/predict_tracks.cc (renamed from extern/libmv/libmv/autotrack/predict_tracks.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/predict_tracks.h (renamed from extern/libmv/libmv/autotrack/predict_tracks.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/predict_tracks_test.cc (renamed from extern/libmv/libmv/autotrack/predict_tracks_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/quad.h (renamed from extern/libmv/libmv/autotrack/quad.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/reconstruction.h (renamed from extern/libmv/libmv/autotrack/reconstruction.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/region.h (renamed from extern/libmv/libmv/autotrack/region.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/tracks.cc (renamed from extern/libmv/libmv/autotrack/tracks.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/tracks.h (renamed from extern/libmv/libmv/autotrack/tracks.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/autotrack/tracks_test.cc (renamed from extern/libmv/libmv/autotrack/tracks_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/base/aligned_malloc.cc (renamed from extern/libmv/libmv/base/aligned_malloc.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/base/aligned_malloc.h (renamed from extern/libmv/libmv/base/aligned_malloc.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/base/id_generator.h (renamed from extern/libmv/libmv/base/id_generator.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/base/scoped_ptr.h (renamed from extern/libmv/libmv/base/scoped_ptr.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/base/scoped_ptr_test.cc (renamed from extern/libmv/libmv/base/scoped_ptr_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/base/vector.h (renamed from extern/libmv/libmv/base/vector.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/base/vector_test.cc (renamed from extern/libmv/libmv/base/vector_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/base/vector_utils.h (renamed from extern/libmv/libmv/base/vector_utils.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/array_nd.cc (renamed from extern/libmv/libmv/image/array_nd.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/array_nd.h (renamed from extern/libmv/libmv/image/array_nd.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/array_nd_test.cc (renamed from extern/libmv/libmv/image/array_nd_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/convolve.cc (renamed from extern/libmv/libmv/image/convolve.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/convolve.h (renamed from extern/libmv/libmv/image/convolve.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/convolve_test.cc (renamed from extern/libmv/libmv/image/convolve_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/correlation.h (renamed from extern/libmv/libmv/image/correlation.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/image.h (renamed from extern/libmv/libmv/image/image.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/image_converter.h (renamed from extern/libmv/libmv/image/image_converter.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/image_drawing.h (renamed from extern/libmv/libmv/image/image_drawing.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/image_test.cc (renamed from extern/libmv/libmv/image/image_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/sample.h (renamed from extern/libmv/libmv/image/sample.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/sample_test.cc (renamed from extern/libmv/libmv/image/sample_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/tuple.h (renamed from extern/libmv/libmv/image/tuple.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/image/tuple_test.cc (renamed from extern/libmv/libmv/image/tuple_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/logging/logging.h (renamed from extern/libmv/libmv/logging/logging.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/conditioning.cc (renamed from extern/libmv/libmv/multiview/conditioning.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/conditioning.h (renamed from extern/libmv/libmv/multiview/conditioning.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/euclidean_resection.cc (renamed from extern/libmv/libmv/multiview/euclidean_resection.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/euclidean_resection.h (renamed from extern/libmv/libmv/multiview/euclidean_resection.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/euclidean_resection_test.cc (renamed from extern/libmv/libmv/multiview/euclidean_resection_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/fundamental.cc (renamed from extern/libmv/libmv/multiview/fundamental.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/fundamental.h (renamed from extern/libmv/libmv/multiview/fundamental.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/fundamental_test.cc (renamed from extern/libmv/libmv/multiview/fundamental_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/homography.cc (renamed from extern/libmv/libmv/multiview/homography.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/homography.h (renamed from extern/libmv/libmv/multiview/homography.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/homography_error.h (renamed from extern/libmv/libmv/multiview/homography_error.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/homography_parameterization.h (renamed from extern/libmv/libmv/multiview/homography_parameterization.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/homography_test.cc (renamed from extern/libmv/libmv/multiview/homography_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/nviewtriangulation.h (renamed from extern/libmv/libmv/multiview/nviewtriangulation.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/nviewtriangulation_test.cc (renamed from extern/libmv/libmv/multiview/nviewtriangulation_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/panography.cc (renamed from extern/libmv/libmv/multiview/panography.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/panography.h (renamed from extern/libmv/libmv/multiview/panography.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/panography_kernel.cc (renamed from extern/libmv/libmv/multiview/panography_kernel.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/panography_kernel.h (renamed from extern/libmv/libmv/multiview/panography_kernel.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/panography_test.cc (renamed from extern/libmv/libmv/multiview/panography_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/projection.cc (renamed from extern/libmv/libmv/multiview/projection.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/projection.h (renamed from extern/libmv/libmv/multiview/projection.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/projection_test.cc (renamed from extern/libmv/libmv/multiview/projection_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/resection.h (renamed from extern/libmv/libmv/multiview/resection.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/resection_test.cc (renamed from extern/libmv/libmv/multiview/resection_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/test_data_sets.cc (renamed from extern/libmv/libmv/multiview/test_data_sets.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/test_data_sets.h (renamed from extern/libmv/libmv/multiview/test_data_sets.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/triangulation.cc (renamed from extern/libmv/libmv/multiview/triangulation.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/triangulation.h (renamed from extern/libmv/libmv/multiview/triangulation.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/triangulation_test.cc (renamed from extern/libmv/libmv/multiview/triangulation_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/multiview/two_view_kernel.h (renamed from extern/libmv/libmv/multiview/two_view_kernel.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/dogleg.h (renamed from extern/libmv/libmv/numeric/dogleg.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/dogleg_test.cc (renamed from extern/libmv/libmv/numeric/dogleg_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/function_derivative.h (renamed from extern/libmv/libmv/numeric/function_derivative.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/function_derivative_test.cc (renamed from extern/libmv/libmv/numeric/function_derivative_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/levenberg_marquardt.h (renamed from extern/libmv/libmv/numeric/levenberg_marquardt.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/levenberg_marquardt_test.cc (renamed from extern/libmv/libmv/numeric/levenberg_marquardt_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/numeric.cc (renamed from extern/libmv/libmv/numeric/numeric.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/numeric.h (renamed from extern/libmv/libmv/numeric/numeric.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/numeric_test.cc (renamed from extern/libmv/libmv/numeric/numeric_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/poly.cc (renamed from extern/libmv/libmv/numeric/poly.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/poly.h (renamed from extern/libmv/libmv/numeric/poly.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/poly_test.cc (renamed from extern/libmv/libmv/numeric/poly_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/bundle.cc (renamed from extern/libmv/libmv/simple_pipeline/bundle.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/bundle.h (renamed from extern/libmv/libmv/simple_pipeline/bundle.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/callbacks.h (renamed from extern/libmv/libmv/simple_pipeline/callbacks.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/camera_intrinsics.cc (renamed from extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/camera_intrinsics.h (renamed from extern/libmv/libmv/simple_pipeline/camera_intrinsics.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h (renamed from extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc (renamed from extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/detect.cc (renamed from extern/libmv/libmv/simple_pipeline/detect.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/detect.h (renamed from extern/libmv/libmv/simple_pipeline/detect.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/detect_test.cc (renamed from extern/libmv/libmv/simple_pipeline/detect_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/distortion_models.cc (renamed from extern/libmv/libmv/simple_pipeline/distortion_models.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/distortion_models.h (renamed from extern/libmv/libmv/simple_pipeline/distortion_models.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc (renamed from extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/initialize_reconstruction.h (renamed from extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/intersect.cc (renamed from extern/libmv/libmv/simple_pipeline/intersect.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/intersect.h (renamed from extern/libmv/libmv/simple_pipeline/intersect.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/intersect_test.cc (renamed from extern/libmv/libmv/simple_pipeline/intersect_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/keyframe_selection.cc (renamed from extern/libmv/libmv/simple_pipeline/keyframe_selection.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/keyframe_selection.h (renamed from extern/libmv/libmv/simple_pipeline/keyframe_selection.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc (renamed from extern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/modal_solver.cc (renamed from extern/libmv/libmv/simple_pipeline/modal_solver.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/modal_solver.h (renamed from extern/libmv/libmv/simple_pipeline/modal_solver.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/modal_solver_test.cc (renamed from extern/libmv/libmv/simple_pipeline/modal_solver_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/pipeline.cc (renamed from extern/libmv/libmv/simple_pipeline/pipeline.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/pipeline.h (renamed from extern/libmv/libmv/simple_pipeline/pipeline.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/reconstruction.cc (renamed from extern/libmv/libmv/simple_pipeline/reconstruction.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/reconstruction.h (renamed from extern/libmv/libmv/simple_pipeline/reconstruction.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc (renamed from extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/reconstruction_scale.h (renamed from extern/libmv/libmv/simple_pipeline/reconstruction_scale.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/resect.cc (renamed from extern/libmv/libmv/simple_pipeline/resect.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/resect.h (renamed from extern/libmv/libmv/simple_pipeline/resect.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/resect_test.cc (renamed from extern/libmv/libmv/simple_pipeline/resect_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/tracks.cc (renamed from extern/libmv/libmv/simple_pipeline/tracks.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/tracks.h (renamed from extern/libmv/libmv/simple_pipeline/tracks.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/brute_region_tracker.cc (renamed from extern/libmv/libmv/tracking/brute_region_tracker.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/brute_region_tracker.h (renamed from extern/libmv/libmv/tracking/brute_region_tracker.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/brute_region_tracker_test.cc (renamed from extern/libmv/libmv/tracking/brute_region_tracker_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/hybrid_region_tracker.cc (renamed from extern/libmv/libmv/tracking/hybrid_region_tracker.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/hybrid_region_tracker.h (renamed from extern/libmv/libmv/tracking/hybrid_region_tracker.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/kalman_filter.h (renamed from extern/libmv/libmv/tracking/kalman_filter.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/klt_region_tracker.cc (renamed from extern/libmv/libmv/tracking/klt_region_tracker.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/klt_region_tracker.h (renamed from extern/libmv/libmv/tracking/klt_region_tracker.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/klt_region_tracker_test.cc (renamed from extern/libmv/libmv/tracking/klt_region_tracker_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/pyramid_region_tracker.cc (renamed from extern/libmv/libmv/tracking/pyramid_region_tracker.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/pyramid_region_tracker.h (renamed from extern/libmv/libmv/tracking/pyramid_region_tracker.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/pyramid_region_tracker_test.cc (renamed from extern/libmv/libmv/tracking/pyramid_region_tracker_test.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/region_tracker.h (renamed from extern/libmv/libmv/tracking/region_tracker.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/retrack_region_tracker.cc (renamed from extern/libmv/libmv/tracking/retrack_region_tracker.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/retrack_region_tracker.h (renamed from extern/libmv/libmv/tracking/retrack_region_tracker.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/track_region.cc (renamed from extern/libmv/libmv/tracking/track_region.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/track_region.h (renamed from extern/libmv/libmv/tracking/track_region.h) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/trklt_region_tracker.cc (renamed from extern/libmv/libmv/tracking/trklt_region_tracker.cc) | 0 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/trklt_region_tracker.h (renamed from extern/libmv/libmv/tracking/trklt_region_tracker.h) | 0 | ||||
-rwxr-xr-x | intern/libmv/mkfiles.sh (renamed from extern/libmv/mkfiles.sh) | 0 | ||||
-rw-r--r-- | intern/libmv/third_party/msinttypes/README.libmv (renamed from extern/libmv/third_party/msinttypes/README.libmv) | 0 | ||||
-rw-r--r-- | intern/libmv/third_party/msinttypes/inttypes.h (renamed from extern/libmv/third_party/msinttypes/inttypes.h) | 0 | ||||
-rw-r--r-- | intern/libmv/third_party/msinttypes/stdint.h (renamed from extern/libmv/third_party/msinttypes/stdint.h) | 0 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 2 |
175 files changed, 25 insertions, 25 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index e57f93e6dce..3672dbf11bc 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -628,7 +628,7 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_intern_eigen extern_rangetree extern_wcwidth - extern_libmv + bf_intern_libmv extern_glog extern_gflags extern_sdlew diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 3c8e8150ba1..632b68ef074 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -28,7 +28,6 @@ remove_strict_flags() add_subdirectory(rangetree) add_subdirectory(wcwidth) -add_subdirectory(libmv) if(WITH_BULLET) if(NOT WITH_SYSTEM_BULLET) diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 275524f788f..71cbf5dbb65 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -27,6 +27,7 @@ add_subdirectory(string) add_subdirectory(ghost) add_subdirectory(guardedalloc) +add_subdirectory(libmv) add_subdirectory(memutil) add_subdirectory(opencolorio) add_subdirectory(mikktspace) diff --git a/extern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index 375031fd1cb..65f8af5694e 100644 --- a/extern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -37,17 +37,17 @@ set(SRC libmv-capi.h ) -add_definitions(${GFLAGS_DEFINES}) -add_definitions(${GLOG_DEFINES}) -add_definitions(${CERES_DEFINES}) - if(WITH_LIBMV) + add_definitions(${GFLAGS_DEFINES}) + add_definitions(${GLOG_DEFINES}) + add_definitions(${CERES_DEFINES}) + list(APPEND INC - ../gflags/src - ../glog/src - third_party/ceres/include - third_party/ceres/config - ../../intern/guardedalloc + ../../extern/gflags/src + ../../extern/glog/src + ../../extern/ceres/include + ../../extern/ceres/config + ../guardedalloc ) list(APPEND INC_SYS @@ -235,4 +235,4 @@ else() ) endif() -blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/libmv/ChangeLog b/intern/libmv/ChangeLog index 63c9963a22f..63c9963a22f 100644 --- a/extern/libmv/ChangeLog +++ b/intern/libmv/ChangeLog diff --git a/extern/libmv/bundle.sh b/intern/libmv/bundle.sh index 273365bb31a..e719e592c02 100755 --- a/extern/libmv/bundle.sh +++ b/intern/libmv/bundle.sh @@ -116,17 +116,17 @@ set(SRC libmv-capi.h ) -add_definitions(\${GFLAGS_DEFINES}) -add_definitions(\${GLOG_DEFINES}) -add_definitions(\${CERES_DEFINES}) - if(WITH_LIBMV) + add_definitions(\${GFLAGS_DEFINES}) + add_definitions(\${GLOG_DEFINES}) + add_definitions(\${CERES_DEFINES}) + list(APPEND INC - ../gflags/src - ../glog/src - third_party/ceres/include - third_party/ceres/config - ../../intern/guardedalloc + ../../extern/gflags/src + ../../extern/glog/src + ../../extern/ceres/include + ../../extern/ceres/config + ../guardedalloc ) list(APPEND INC_SYS @@ -183,5 +183,5 @@ else() ) endif() -blender_add_lib(extern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}") +blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}") EOF diff --git a/extern/libmv/files.txt b/intern/libmv/files.txt index 223066bb02f..223066bb02f 100644 --- a/extern/libmv/files.txt +++ b/intern/libmv/files.txt diff --git a/extern/libmv/intern/autotrack.cc b/intern/libmv/intern/autotrack.cc index f0cbc68f11e..f0cbc68f11e 100644 --- a/extern/libmv/intern/autotrack.cc +++ b/intern/libmv/intern/autotrack.cc diff --git a/extern/libmv/intern/autotrack.h b/intern/libmv/intern/autotrack.h index 2a4a8f3c97f..2a4a8f3c97f 100644 --- a/extern/libmv/intern/autotrack.h +++ b/intern/libmv/intern/autotrack.h diff --git a/extern/libmv/intern/camera_intrinsics.cc b/intern/libmv/intern/camera_intrinsics.cc index 0ce757cc93b..0ce757cc93b 100644 --- a/extern/libmv/intern/camera_intrinsics.cc +++ b/intern/libmv/intern/camera_intrinsics.cc diff --git a/extern/libmv/intern/camera_intrinsics.h b/intern/libmv/intern/camera_intrinsics.h index 9910d16a108..9910d16a108 100644 --- a/extern/libmv/intern/camera_intrinsics.h +++ b/intern/libmv/intern/camera_intrinsics.h diff --git a/extern/libmv/intern/detector.cc b/intern/libmv/intern/detector.cc index 8abc9014115..8abc9014115 100644 --- a/extern/libmv/intern/detector.cc +++ b/intern/libmv/intern/detector.cc diff --git a/extern/libmv/intern/detector.h b/intern/libmv/intern/detector.h index f72b0dd8d6e..f72b0dd8d6e 100644 --- a/extern/libmv/intern/detector.h +++ b/intern/libmv/intern/detector.h diff --git a/extern/libmv/intern/frame_accessor.cc b/intern/libmv/intern/frame_accessor.cc index 8bf2cab914b..8bf2cab914b 100644 --- a/extern/libmv/intern/frame_accessor.cc +++ b/intern/libmv/intern/frame_accessor.cc diff --git a/extern/libmv/intern/frame_accessor.h b/intern/libmv/intern/frame_accessor.h index 3e813fe7581..3e813fe7581 100644 --- a/extern/libmv/intern/frame_accessor.h +++ b/intern/libmv/intern/frame_accessor.h diff --git a/extern/libmv/intern/homography.cc b/intern/libmv/intern/homography.cc index 6b61bd9ab42..6b61bd9ab42 100644 --- a/extern/libmv/intern/homography.cc +++ b/intern/libmv/intern/homography.cc diff --git a/extern/libmv/intern/homography.h b/intern/libmv/intern/homography.h index 175108e8171..175108e8171 100644 --- a/extern/libmv/intern/homography.h +++ b/intern/libmv/intern/homography.h diff --git a/extern/libmv/intern/image.cc b/intern/libmv/intern/image.cc index 5018caef5b1..5018caef5b1 100644 --- a/extern/libmv/intern/image.cc +++ b/intern/libmv/intern/image.cc diff --git a/extern/libmv/intern/image.h b/intern/libmv/intern/image.h index 1213943aac4..1213943aac4 100644 --- a/extern/libmv/intern/image.h +++ b/intern/libmv/intern/image.h diff --git a/extern/libmv/intern/logging.cc b/intern/libmv/intern/logging.cc index 77b56ef4df3..77b56ef4df3 100644 --- a/extern/libmv/intern/logging.cc +++ b/intern/libmv/intern/logging.cc diff --git a/extern/libmv/intern/logging.h b/intern/libmv/intern/logging.h index 479ed3d6288..479ed3d6288 100644 --- a/extern/libmv/intern/logging.h +++ b/intern/libmv/intern/logging.h diff --git a/extern/libmv/intern/reconstruction.cc b/intern/libmv/intern/reconstruction.cc index 046671e467f..046671e467f 100644 --- a/extern/libmv/intern/reconstruction.cc +++ b/intern/libmv/intern/reconstruction.cc diff --git a/extern/libmv/intern/reconstruction.h b/intern/libmv/intern/reconstruction.h index 8b6b34a6142..8b6b34a6142 100644 --- a/extern/libmv/intern/reconstruction.h +++ b/intern/libmv/intern/reconstruction.h diff --git a/extern/libmv/intern/region.h b/intern/libmv/intern/region.h index 9f114bbad3b..9f114bbad3b 100644 --- a/extern/libmv/intern/region.h +++ b/intern/libmv/intern/region.h diff --git a/extern/libmv/intern/stub.cc b/intern/libmv/intern/stub.cc index 5d667baa880..5d667baa880 100644 --- a/extern/libmv/intern/stub.cc +++ b/intern/libmv/intern/stub.cc diff --git a/extern/libmv/intern/track_region.cc b/intern/libmv/intern/track_region.cc index 24fbc78c1a1..24fbc78c1a1 100644 --- a/extern/libmv/intern/track_region.cc +++ b/intern/libmv/intern/track_region.cc diff --git a/extern/libmv/intern/track_region.h b/intern/libmv/intern/track_region.h index 7ed3e443e40..7ed3e443e40 100644 --- a/extern/libmv/intern/track_region.h +++ b/intern/libmv/intern/track_region.h diff --git a/extern/libmv/intern/tracks.cc b/intern/libmv/intern/tracks.cc index 9b032b0760a..9b032b0760a 100644 --- a/extern/libmv/intern/tracks.cc +++ b/intern/libmv/intern/tracks.cc diff --git a/extern/libmv/intern/tracks.h b/intern/libmv/intern/tracks.h index 79f6cc99579..79f6cc99579 100644 --- a/extern/libmv/intern/tracks.h +++ b/intern/libmv/intern/tracks.h diff --git a/extern/libmv/intern/tracksN.cc b/intern/libmv/intern/tracksN.cc index 9e1da88ef10..9e1da88ef10 100644 --- a/extern/libmv/intern/tracksN.cc +++ b/intern/libmv/intern/tracksN.cc diff --git a/extern/libmv/intern/tracksN.h b/intern/libmv/intern/tracksN.h index d0cb54e40bc..d0cb54e40bc 100644 --- a/extern/libmv/intern/tracksN.h +++ b/intern/libmv/intern/tracksN.h diff --git a/extern/libmv/intern/utildefines.h b/intern/libmv/intern/utildefines.h index b1f11d6091e..b1f11d6091e 100644 --- a/extern/libmv/intern/utildefines.h +++ b/intern/libmv/intern/utildefines.h diff --git a/extern/libmv/libmv-capi.h b/intern/libmv/libmv-capi.h index 92e206a19b2..92e206a19b2 100644 --- a/extern/libmv/libmv-capi.h +++ b/intern/libmv/libmv-capi.h diff --git a/extern/libmv/libmv/autotrack/autotrack.cc b/intern/libmv/libmv/autotrack/autotrack.cc index 4c7bdf1fde8..4c7bdf1fde8 100644 --- a/extern/libmv/libmv/autotrack/autotrack.cc +++ b/intern/libmv/libmv/autotrack/autotrack.cc diff --git a/extern/libmv/libmv/autotrack/autotrack.h b/intern/libmv/libmv/autotrack/autotrack.h index 1d7422f54e7..1d7422f54e7 100644 --- a/extern/libmv/libmv/autotrack/autotrack.h +++ b/intern/libmv/libmv/autotrack/autotrack.h diff --git a/extern/libmv/libmv/autotrack/callbacks.h b/intern/libmv/libmv/autotrack/callbacks.h index e65841de3ce..e65841de3ce 100644 --- a/extern/libmv/libmv/autotrack/callbacks.h +++ b/intern/libmv/libmv/autotrack/callbacks.h diff --git a/extern/libmv/libmv/autotrack/frame_accessor.h b/intern/libmv/libmv/autotrack/frame_accessor.h index 8de5d865cd7..8de5d865cd7 100644 --- a/extern/libmv/libmv/autotrack/frame_accessor.h +++ b/intern/libmv/libmv/autotrack/frame_accessor.h diff --git a/extern/libmv/libmv/autotrack/marker.h b/intern/libmv/libmv/autotrack/marker.h index bb803313af8..bb803313af8 100644 --- a/extern/libmv/libmv/autotrack/marker.h +++ b/intern/libmv/libmv/autotrack/marker.h diff --git a/extern/libmv/libmv/autotrack/model.h b/intern/libmv/libmv/autotrack/model.h index 1165281cdac..1165281cdac 100644 --- a/extern/libmv/libmv/autotrack/model.h +++ b/intern/libmv/libmv/autotrack/model.h diff --git a/extern/libmv/libmv/autotrack/predict_tracks.cc b/intern/libmv/libmv/autotrack/predict_tracks.cc index adc986a0033..adc986a0033 100644 --- a/extern/libmv/libmv/autotrack/predict_tracks.cc +++ b/intern/libmv/libmv/autotrack/predict_tracks.cc diff --git a/extern/libmv/libmv/autotrack/predict_tracks.h b/intern/libmv/libmv/autotrack/predict_tracks.h index 0a176d08378..0a176d08378 100644 --- a/extern/libmv/libmv/autotrack/predict_tracks.h +++ b/intern/libmv/libmv/autotrack/predict_tracks.h diff --git a/extern/libmv/libmv/autotrack/predict_tracks_test.cc b/intern/libmv/libmv/autotrack/predict_tracks_test.cc index fc90e260d94..fc90e260d94 100644 --- a/extern/libmv/libmv/autotrack/predict_tracks_test.cc +++ b/intern/libmv/libmv/autotrack/predict_tracks_test.cc diff --git a/extern/libmv/libmv/autotrack/quad.h b/intern/libmv/libmv/autotrack/quad.h index 0c70f9882da..0c70f9882da 100644 --- a/extern/libmv/libmv/autotrack/quad.h +++ b/intern/libmv/libmv/autotrack/quad.h diff --git a/extern/libmv/libmv/autotrack/reconstruction.h b/intern/libmv/libmv/autotrack/reconstruction.h index e1d4e882cbd..e1d4e882cbd 100644 --- a/extern/libmv/libmv/autotrack/reconstruction.h +++ b/intern/libmv/libmv/autotrack/reconstruction.h diff --git a/extern/libmv/libmv/autotrack/region.h b/intern/libmv/libmv/autotrack/region.h index b35d99eb60d..b35d99eb60d 100644 --- a/extern/libmv/libmv/autotrack/region.h +++ b/intern/libmv/libmv/autotrack/region.h diff --git a/extern/libmv/libmv/autotrack/tracks.cc b/intern/libmv/libmv/autotrack/tracks.cc index 174f264f3f2..174f264f3f2 100644 --- a/extern/libmv/libmv/autotrack/tracks.cc +++ b/intern/libmv/libmv/autotrack/tracks.cc diff --git a/extern/libmv/libmv/autotrack/tracks.h b/intern/libmv/libmv/autotrack/tracks.h index 0b7de91d211..0b7de91d211 100644 --- a/extern/libmv/libmv/autotrack/tracks.h +++ b/intern/libmv/libmv/autotrack/tracks.h diff --git a/extern/libmv/libmv/autotrack/tracks_test.cc b/intern/libmv/libmv/autotrack/tracks_test.cc index 028b4a10913..028b4a10913 100644 --- a/extern/libmv/libmv/autotrack/tracks_test.cc +++ b/intern/libmv/libmv/autotrack/tracks_test.cc diff --git a/extern/libmv/libmv/base/aligned_malloc.cc b/intern/libmv/libmv/base/aligned_malloc.cc index 9141186f196..9141186f196 100644 --- a/extern/libmv/libmv/base/aligned_malloc.cc +++ b/intern/libmv/libmv/base/aligned_malloc.cc diff --git a/extern/libmv/libmv/base/aligned_malloc.h b/intern/libmv/libmv/base/aligned_malloc.h index 096ff6e2d7c..096ff6e2d7c 100644 --- a/extern/libmv/libmv/base/aligned_malloc.h +++ b/intern/libmv/libmv/base/aligned_malloc.h diff --git a/extern/libmv/libmv/base/id_generator.h b/intern/libmv/libmv/base/id_generator.h index bf1eafd218e..bf1eafd218e 100644 --- a/extern/libmv/libmv/base/id_generator.h +++ b/intern/libmv/libmv/base/id_generator.h diff --git a/extern/libmv/libmv/base/scoped_ptr.h b/intern/libmv/libmv/base/scoped_ptr.h index b9cd4854213..b9cd4854213 100644 --- a/extern/libmv/libmv/base/scoped_ptr.h +++ b/intern/libmv/libmv/base/scoped_ptr.h diff --git a/extern/libmv/libmv/base/scoped_ptr_test.cc b/intern/libmv/libmv/base/scoped_ptr_test.cc index ce1d56b500a..ce1d56b500a 100644 --- a/extern/libmv/libmv/base/scoped_ptr_test.cc +++ b/intern/libmv/libmv/base/scoped_ptr_test.cc diff --git a/extern/libmv/libmv/base/vector.h b/intern/libmv/libmv/base/vector.h index 1931fb0b1f9..1931fb0b1f9 100644 --- a/extern/libmv/libmv/base/vector.h +++ b/intern/libmv/libmv/base/vector.h diff --git a/extern/libmv/libmv/base/vector_test.cc b/intern/libmv/libmv/base/vector_test.cc index f17718c3926..f17718c3926 100644 --- a/extern/libmv/libmv/base/vector_test.cc +++ b/intern/libmv/libmv/base/vector_test.cc diff --git a/extern/libmv/libmv/base/vector_utils.h b/intern/libmv/libmv/base/vector_utils.h index c71e1bea951..c71e1bea951 100644 --- a/extern/libmv/libmv/base/vector_utils.h +++ b/intern/libmv/libmv/base/vector_utils.h diff --git a/extern/libmv/libmv/image/array_nd.cc b/intern/libmv/libmv/image/array_nd.cc index 469a19aabf1..469a19aabf1 100644 --- a/extern/libmv/libmv/image/array_nd.cc +++ b/intern/libmv/libmv/image/array_nd.cc diff --git a/extern/libmv/libmv/image/array_nd.h b/intern/libmv/libmv/image/array_nd.h index e95e66aa2b3..e95e66aa2b3 100644 --- a/extern/libmv/libmv/image/array_nd.h +++ b/intern/libmv/libmv/image/array_nd.h diff --git a/extern/libmv/libmv/image/array_nd_test.cc b/intern/libmv/libmv/image/array_nd_test.cc index 313f21b60e9..313f21b60e9 100644 --- a/extern/libmv/libmv/image/array_nd_test.cc +++ b/intern/libmv/libmv/image/array_nd_test.cc diff --git a/extern/libmv/libmv/image/convolve.cc b/intern/libmv/libmv/image/convolve.cc index 464043581d2..464043581d2 100644 --- a/extern/libmv/libmv/image/convolve.cc +++ b/intern/libmv/libmv/image/convolve.cc diff --git a/extern/libmv/libmv/image/convolve.h b/intern/libmv/libmv/image/convolve.h index d3b6da9794b..d3b6da9794b 100644 --- a/extern/libmv/libmv/image/convolve.h +++ b/intern/libmv/libmv/image/convolve.h diff --git a/extern/libmv/libmv/image/convolve_test.cc b/intern/libmv/libmv/image/convolve_test.cc index 0cdef8e1e72..0cdef8e1e72 100644 --- a/extern/libmv/libmv/image/convolve_test.cc +++ b/intern/libmv/libmv/image/convolve_test.cc diff --git a/extern/libmv/libmv/image/correlation.h b/intern/libmv/libmv/image/correlation.h index c354f7e891e..c354f7e891e 100644 --- a/extern/libmv/libmv/image/correlation.h +++ b/intern/libmv/libmv/image/correlation.h diff --git a/extern/libmv/libmv/image/image.h b/intern/libmv/libmv/image/image.h index e0f200a4c93..e0f200a4c93 100644 --- a/extern/libmv/libmv/image/image.h +++ b/intern/libmv/libmv/image/image.h diff --git a/extern/libmv/libmv/image/image_converter.h b/intern/libmv/libmv/image/image_converter.h index b3a3fa2bf8c..b3a3fa2bf8c 100644 --- a/extern/libmv/libmv/image/image_converter.h +++ b/intern/libmv/libmv/image/image_converter.h diff --git a/extern/libmv/libmv/image/image_drawing.h b/intern/libmv/libmv/image/image_drawing.h index f50e48b75a3..f50e48b75a3 100644 --- a/extern/libmv/libmv/image/image_drawing.h +++ b/intern/libmv/libmv/image/image_drawing.h diff --git a/extern/libmv/libmv/image/image_test.cc b/intern/libmv/libmv/image/image_test.cc index 241f49f2244..241f49f2244 100644 --- a/extern/libmv/libmv/image/image_test.cc +++ b/intern/libmv/libmv/image/image_test.cc diff --git a/extern/libmv/libmv/image/sample.h b/intern/libmv/libmv/image/sample.h index 24eb9ccd57d..24eb9ccd57d 100644 --- a/extern/libmv/libmv/image/sample.h +++ b/intern/libmv/libmv/image/sample.h diff --git a/extern/libmv/libmv/image/sample_test.cc b/intern/libmv/libmv/image/sample_test.cc index c8a0ce470c2..c8a0ce470c2 100644 --- a/extern/libmv/libmv/image/sample_test.cc +++ b/intern/libmv/libmv/image/sample_test.cc diff --git a/extern/libmv/libmv/image/tuple.h b/intern/libmv/libmv/image/tuple.h index c8dc36f2e18..c8dc36f2e18 100644 --- a/extern/libmv/libmv/image/tuple.h +++ b/intern/libmv/libmv/image/tuple.h diff --git a/extern/libmv/libmv/image/tuple_test.cc b/intern/libmv/libmv/image/tuple_test.cc index df44e5638b5..df44e5638b5 100644 --- a/extern/libmv/libmv/image/tuple_test.cc +++ b/intern/libmv/libmv/image/tuple_test.cc diff --git a/extern/libmv/libmv/logging/logging.h b/intern/libmv/libmv/logging/logging.h index 776d9d52f7a..776d9d52f7a 100644 --- a/extern/libmv/libmv/logging/logging.h +++ b/intern/libmv/libmv/logging/logging.h diff --git a/extern/libmv/libmv/multiview/conditioning.cc b/intern/libmv/libmv/multiview/conditioning.cc index 0afbf119ea3..0afbf119ea3 100644 --- a/extern/libmv/libmv/multiview/conditioning.cc +++ b/intern/libmv/libmv/multiview/conditioning.cc diff --git a/extern/libmv/libmv/multiview/conditioning.h b/intern/libmv/libmv/multiview/conditioning.h index 8f3e3a76070..8f3e3a76070 100644 --- a/extern/libmv/libmv/multiview/conditioning.h +++ b/intern/libmv/libmv/multiview/conditioning.h diff --git a/extern/libmv/libmv/multiview/euclidean_resection.cc b/intern/libmv/libmv/multiview/euclidean_resection.cc index 245b027fb7c..245b027fb7c 100644 --- a/extern/libmv/libmv/multiview/euclidean_resection.cc +++ b/intern/libmv/libmv/multiview/euclidean_resection.cc diff --git a/extern/libmv/libmv/multiview/euclidean_resection.h b/intern/libmv/libmv/multiview/euclidean_resection.h index 28eae92611c..28eae92611c 100644 --- a/extern/libmv/libmv/multiview/euclidean_resection.h +++ b/intern/libmv/libmv/multiview/euclidean_resection.h diff --git a/extern/libmv/libmv/multiview/euclidean_resection_test.cc b/intern/libmv/libmv/multiview/euclidean_resection_test.cc index 5ec9dbda3cf..5ec9dbda3cf 100644 --- a/extern/libmv/libmv/multiview/euclidean_resection_test.cc +++ b/intern/libmv/libmv/multiview/euclidean_resection_test.cc diff --git a/extern/libmv/libmv/multiview/fundamental.cc b/intern/libmv/libmv/multiview/fundamental.cc index ea8594c8cc0..ea8594c8cc0 100644 --- a/extern/libmv/libmv/multiview/fundamental.cc +++ b/intern/libmv/libmv/multiview/fundamental.cc diff --git a/extern/libmv/libmv/multiview/fundamental.h b/intern/libmv/libmv/multiview/fundamental.h index 51067aefc2b..51067aefc2b 100644 --- a/extern/libmv/libmv/multiview/fundamental.h +++ b/intern/libmv/libmv/multiview/fundamental.h diff --git a/extern/libmv/libmv/multiview/fundamental_test.cc b/intern/libmv/libmv/multiview/fundamental_test.cc index da0eb449b8f..da0eb449b8f 100644 --- a/extern/libmv/libmv/multiview/fundamental_test.cc +++ b/intern/libmv/libmv/multiview/fundamental_test.cc diff --git a/extern/libmv/libmv/multiview/homography.cc b/intern/libmv/libmv/multiview/homography.cc index ce533a3ead2..ce533a3ead2 100644 --- a/extern/libmv/libmv/multiview/homography.cc +++ b/intern/libmv/libmv/multiview/homography.cc diff --git a/extern/libmv/libmv/multiview/homography.h b/intern/libmv/libmv/multiview/homography.h index 6d810c845ed..6d810c845ed 100644 --- a/extern/libmv/libmv/multiview/homography.h +++ b/intern/libmv/libmv/multiview/homography.h diff --git a/extern/libmv/libmv/multiview/homography_error.h b/intern/libmv/libmv/multiview/homography_error.h index f8b9d45e73c..f8b9d45e73c 100644 --- a/extern/libmv/libmv/multiview/homography_error.h +++ b/intern/libmv/libmv/multiview/homography_error.h diff --git a/extern/libmv/libmv/multiview/homography_parameterization.h b/intern/libmv/libmv/multiview/homography_parameterization.h index ca8fbd8066e..ca8fbd8066e 100644 --- a/extern/libmv/libmv/multiview/homography_parameterization.h +++ b/intern/libmv/libmv/multiview/homography_parameterization.h diff --git a/extern/libmv/libmv/multiview/homography_test.cc b/intern/libmv/libmv/multiview/homography_test.cc index 8d7266e3d11..8d7266e3d11 100644 --- a/extern/libmv/libmv/multiview/homography_test.cc +++ b/intern/libmv/libmv/multiview/homography_test.cc diff --git a/extern/libmv/libmv/multiview/nviewtriangulation.h b/intern/libmv/libmv/multiview/nviewtriangulation.h index f4614ab1a5c..f4614ab1a5c 100644 --- a/extern/libmv/libmv/multiview/nviewtriangulation.h +++ b/intern/libmv/libmv/multiview/nviewtriangulation.h diff --git a/extern/libmv/libmv/multiview/nviewtriangulation_test.cc b/intern/libmv/libmv/multiview/nviewtriangulation_test.cc index 5a4d8499753..5a4d8499753 100644 --- a/extern/libmv/libmv/multiview/nviewtriangulation_test.cc +++ b/intern/libmv/libmv/multiview/nviewtriangulation_test.cc diff --git a/extern/libmv/libmv/multiview/panography.cc b/intern/libmv/libmv/multiview/panography.cc index b62802948c4..b62802948c4 100644 --- a/extern/libmv/libmv/multiview/panography.cc +++ b/intern/libmv/libmv/multiview/panography.cc diff --git a/extern/libmv/libmv/multiview/panography.h b/intern/libmv/libmv/multiview/panography.h index 6e87bd71304..6e87bd71304 100644 --- a/extern/libmv/libmv/multiview/panography.h +++ b/intern/libmv/libmv/multiview/panography.h diff --git a/extern/libmv/libmv/multiview/panography_kernel.cc b/intern/libmv/libmv/multiview/panography_kernel.cc index 8fdc9e79aed..8fdc9e79aed 100644 --- a/extern/libmv/libmv/multiview/panography_kernel.cc +++ b/intern/libmv/libmv/multiview/panography_kernel.cc diff --git a/extern/libmv/libmv/multiview/panography_kernel.h b/intern/libmv/libmv/multiview/panography_kernel.h index a6adbd54b20..a6adbd54b20 100644 --- a/extern/libmv/libmv/multiview/panography_kernel.h +++ b/intern/libmv/libmv/multiview/panography_kernel.h diff --git a/extern/libmv/libmv/multiview/panography_test.cc b/intern/libmv/libmv/multiview/panography_test.cc index f6faf0f6022..f6faf0f6022 100644 --- a/extern/libmv/libmv/multiview/panography_test.cc +++ b/intern/libmv/libmv/multiview/panography_test.cc diff --git a/extern/libmv/libmv/multiview/projection.cc b/intern/libmv/libmv/multiview/projection.cc index f8bece3de68..f8bece3de68 100644 --- a/extern/libmv/libmv/multiview/projection.cc +++ b/intern/libmv/libmv/multiview/projection.cc diff --git a/extern/libmv/libmv/multiview/projection.h b/intern/libmv/libmv/multiview/projection.h index 3220bc2dbbc..3220bc2dbbc 100644 --- a/extern/libmv/libmv/multiview/projection.h +++ b/intern/libmv/libmv/multiview/projection.h diff --git a/extern/libmv/libmv/multiview/projection_test.cc b/intern/libmv/libmv/multiview/projection_test.cc index c060bfb0681..c060bfb0681 100644 --- a/extern/libmv/libmv/multiview/projection_test.cc +++ b/intern/libmv/libmv/multiview/projection_test.cc diff --git a/extern/libmv/libmv/multiview/resection.h b/intern/libmv/libmv/multiview/resection.h index c142d6deeb2..c142d6deeb2 100644 --- a/extern/libmv/libmv/multiview/resection.h +++ b/intern/libmv/libmv/multiview/resection.h diff --git a/extern/libmv/libmv/multiview/resection_test.cc b/intern/libmv/libmv/multiview/resection_test.cc index 368e2281cfa..368e2281cfa 100644 --- a/extern/libmv/libmv/multiview/resection_test.cc +++ b/intern/libmv/libmv/multiview/resection_test.cc diff --git a/extern/libmv/libmv/multiview/test_data_sets.cc b/intern/libmv/libmv/multiview/test_data_sets.cc index 110bde6f762..110bde6f762 100644 --- a/extern/libmv/libmv/multiview/test_data_sets.cc +++ b/intern/libmv/libmv/multiview/test_data_sets.cc diff --git a/extern/libmv/libmv/multiview/test_data_sets.h b/intern/libmv/libmv/multiview/test_data_sets.h index cf01663ca02..cf01663ca02 100644 --- a/extern/libmv/libmv/multiview/test_data_sets.h +++ b/intern/libmv/libmv/multiview/test_data_sets.h diff --git a/extern/libmv/libmv/multiview/triangulation.cc b/intern/libmv/libmv/multiview/triangulation.cc index 4d146c8f21b..4d146c8f21b 100644 --- a/extern/libmv/libmv/multiview/triangulation.cc +++ b/intern/libmv/libmv/multiview/triangulation.cc diff --git a/extern/libmv/libmv/multiview/triangulation.h b/intern/libmv/libmv/multiview/triangulation.h index be878890242..be878890242 100644 --- a/extern/libmv/libmv/multiview/triangulation.h +++ b/intern/libmv/libmv/multiview/triangulation.h diff --git a/extern/libmv/libmv/multiview/triangulation_test.cc b/intern/libmv/libmv/multiview/triangulation_test.cc index 66d1ee25a62..66d1ee25a62 100644 --- a/extern/libmv/libmv/multiview/triangulation_test.cc +++ b/intern/libmv/libmv/multiview/triangulation_test.cc diff --git a/extern/libmv/libmv/multiview/two_view_kernel.h b/intern/libmv/libmv/multiview/two_view_kernel.h index 7af0ed5ddab..7af0ed5ddab 100644 --- a/extern/libmv/libmv/multiview/two_view_kernel.h +++ b/intern/libmv/libmv/multiview/two_view_kernel.h diff --git a/extern/libmv/libmv/numeric/dogleg.h b/intern/libmv/libmv/numeric/dogleg.h index bf6f996ddaf..bf6f996ddaf 100644 --- a/extern/libmv/libmv/numeric/dogleg.h +++ b/intern/libmv/libmv/numeric/dogleg.h diff --git a/extern/libmv/libmv/numeric/dogleg_test.cc b/intern/libmv/libmv/numeric/dogleg_test.cc index 90c46c31672..90c46c31672 100644 --- a/extern/libmv/libmv/numeric/dogleg_test.cc +++ b/intern/libmv/libmv/numeric/dogleg_test.cc diff --git a/extern/libmv/libmv/numeric/function_derivative.h b/intern/libmv/libmv/numeric/function_derivative.h index 9820885f04e..9820885f04e 100644 --- a/extern/libmv/libmv/numeric/function_derivative.h +++ b/intern/libmv/libmv/numeric/function_derivative.h diff --git a/extern/libmv/libmv/numeric/function_derivative_test.cc b/intern/libmv/libmv/numeric/function_derivative_test.cc index 8d976d3e9a0..8d976d3e9a0 100644 --- a/extern/libmv/libmv/numeric/function_derivative_test.cc +++ b/intern/libmv/libmv/numeric/function_derivative_test.cc diff --git a/extern/libmv/libmv/numeric/levenberg_marquardt.h b/intern/libmv/libmv/numeric/levenberg_marquardt.h index 2af9a62cf7b..2af9a62cf7b 100644 --- a/extern/libmv/libmv/numeric/levenberg_marquardt.h +++ b/intern/libmv/libmv/numeric/levenberg_marquardt.h diff --git a/extern/libmv/libmv/numeric/levenberg_marquardt_test.cc b/intern/libmv/libmv/numeric/levenberg_marquardt_test.cc index fc3f9ebbb29..fc3f9ebbb29 100644 --- a/extern/libmv/libmv/numeric/levenberg_marquardt_test.cc +++ b/intern/libmv/libmv/numeric/levenberg_marquardt_test.cc diff --git a/extern/libmv/libmv/numeric/numeric.cc b/intern/libmv/libmv/numeric/numeric.cc index 9007663c8e2..9007663c8e2 100644 --- a/extern/libmv/libmv/numeric/numeric.cc +++ b/intern/libmv/libmv/numeric/numeric.cc diff --git a/extern/libmv/libmv/numeric/numeric.h b/intern/libmv/libmv/numeric/numeric.h index 55d4c7d4651..55d4c7d4651 100644 --- a/extern/libmv/libmv/numeric/numeric.h +++ b/intern/libmv/libmv/numeric/numeric.h diff --git a/extern/libmv/libmv/numeric/numeric_test.cc b/intern/libmv/libmv/numeric/numeric_test.cc index 0cdfaf33ab2..0cdfaf33ab2 100644 --- a/extern/libmv/libmv/numeric/numeric_test.cc +++ b/intern/libmv/libmv/numeric/numeric_test.cc diff --git a/extern/libmv/libmv/numeric/poly.cc b/intern/libmv/libmv/numeric/poly.cc index 376403616c3..376403616c3 100644 --- a/extern/libmv/libmv/numeric/poly.cc +++ b/intern/libmv/libmv/numeric/poly.cc diff --git a/extern/libmv/libmv/numeric/poly.h b/intern/libmv/libmv/numeric/poly.h index 76ba062d475..76ba062d475 100644 --- a/extern/libmv/libmv/numeric/poly.h +++ b/intern/libmv/libmv/numeric/poly.h diff --git a/extern/libmv/libmv/numeric/poly_test.cc b/intern/libmv/libmv/numeric/poly_test.cc index ea50383190f..ea50383190f 100644 --- a/extern/libmv/libmv/numeric/poly_test.cc +++ b/intern/libmv/libmv/numeric/poly_test.cc diff --git a/extern/libmv/libmv/simple_pipeline/bundle.cc b/intern/libmv/libmv/simple_pipeline/bundle.cc index e61650fb371..e61650fb371 100644 --- a/extern/libmv/libmv/simple_pipeline/bundle.cc +++ b/intern/libmv/libmv/simple_pipeline/bundle.cc diff --git a/extern/libmv/libmv/simple_pipeline/bundle.h b/intern/libmv/libmv/simple_pipeline/bundle.h index 781bd8476fe..781bd8476fe 100644 --- a/extern/libmv/libmv/simple_pipeline/bundle.h +++ b/intern/libmv/libmv/simple_pipeline/bundle.h diff --git a/extern/libmv/libmv/simple_pipeline/callbacks.h b/intern/libmv/libmv/simple_pipeline/callbacks.h index 58f7b0d3cc9..58f7b0d3cc9 100644 --- a/extern/libmv/libmv/simple_pipeline/callbacks.h +++ b/intern/libmv/libmv/simple_pipeline/callbacks.h diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc b/intern/libmv/libmv/simple_pipeline/camera_intrinsics.cc index 5e4e07b3c4c..5e4e07b3c4c 100644 --- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc +++ b/intern/libmv/libmv/simple_pipeline/camera_intrinsics.cc diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h b/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h index 6a3ade81089..6a3ade81089 100644 --- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h +++ b/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h b/intern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h index 97abee7ab01..97abee7ab01 100644 --- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h +++ b/intern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc b/intern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc index 96d35a29ef8..96d35a29ef8 100644 --- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc +++ b/intern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc diff --git a/extern/libmv/libmv/simple_pipeline/detect.cc b/intern/libmv/libmv/simple_pipeline/detect.cc index 46599a4c49e..46599a4c49e 100644 --- a/extern/libmv/libmv/simple_pipeline/detect.cc +++ b/intern/libmv/libmv/simple_pipeline/detect.cc diff --git a/extern/libmv/libmv/simple_pipeline/detect.h b/intern/libmv/libmv/simple_pipeline/detect.h index 1035287bcf2..1035287bcf2 100644 --- a/extern/libmv/libmv/simple_pipeline/detect.h +++ b/intern/libmv/libmv/simple_pipeline/detect.h diff --git a/extern/libmv/libmv/simple_pipeline/detect_test.cc b/intern/libmv/libmv/simple_pipeline/detect_test.cc index fe57e3d04a2..fe57e3d04a2 100644 --- a/extern/libmv/libmv/simple_pipeline/detect_test.cc +++ b/intern/libmv/libmv/simple_pipeline/detect_test.cc diff --git a/extern/libmv/libmv/simple_pipeline/distortion_models.cc b/intern/libmv/libmv/simple_pipeline/distortion_models.cc index 9b6dca2678a..9b6dca2678a 100644 --- a/extern/libmv/libmv/simple_pipeline/distortion_models.cc +++ b/intern/libmv/libmv/simple_pipeline/distortion_models.cc diff --git a/extern/libmv/libmv/simple_pipeline/distortion_models.h b/intern/libmv/libmv/simple_pipeline/distortion_models.h index 4f8e2295a0e..4f8e2295a0e 100644 --- a/extern/libmv/libmv/simple_pipeline/distortion_models.h +++ b/intern/libmv/libmv/simple_pipeline/distortion_models.h diff --git a/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc b/intern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc index 7a086c375d5..7a086c375d5 100644 --- a/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc +++ b/intern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc diff --git a/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h b/intern/libmv/libmv/simple_pipeline/initialize_reconstruction.h index 744436246b0..744436246b0 100644 --- a/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h +++ b/intern/libmv/libmv/simple_pipeline/initialize_reconstruction.h diff --git a/extern/libmv/libmv/simple_pipeline/intersect.cc b/intern/libmv/libmv/simple_pipeline/intersect.cc index ddb713684a4..ddb713684a4 100644 --- a/extern/libmv/libmv/simple_pipeline/intersect.cc +++ b/intern/libmv/libmv/simple_pipeline/intersect.cc diff --git a/extern/libmv/libmv/simple_pipeline/intersect.h b/intern/libmv/libmv/simple_pipeline/intersect.h index 3a0ffa7418b..3a0ffa7418b 100644 --- a/extern/libmv/libmv/simple_pipeline/intersect.h +++ b/intern/libmv/libmv/simple_pipeline/intersect.h diff --git a/extern/libmv/libmv/simple_pipeline/intersect_test.cc b/intern/libmv/libmv/simple_pipeline/intersect_test.cc index dd4fdc789af..dd4fdc789af 100644 --- a/extern/libmv/libmv/simple_pipeline/intersect_test.cc +++ b/intern/libmv/libmv/simple_pipeline/intersect_test.cc diff --git a/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc b/intern/libmv/libmv/simple_pipeline/keyframe_selection.cc index 241b5600505..241b5600505 100644 --- a/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc +++ b/intern/libmv/libmv/simple_pipeline/keyframe_selection.cc diff --git a/extern/libmv/libmv/simple_pipeline/keyframe_selection.h b/intern/libmv/libmv/simple_pipeline/keyframe_selection.h index aa3eeaf193d..aa3eeaf193d 100644 --- a/extern/libmv/libmv/simple_pipeline/keyframe_selection.h +++ b/intern/libmv/libmv/simple_pipeline/keyframe_selection.h diff --git a/extern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc b/intern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc index 9d88362cc88..9d88362cc88 100644 --- a/extern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc +++ b/intern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc diff --git a/extern/libmv/libmv/simple_pipeline/modal_solver.cc b/intern/libmv/libmv/simple_pipeline/modal_solver.cc index 15e185eeda7..15e185eeda7 100644 --- a/extern/libmv/libmv/simple_pipeline/modal_solver.cc +++ b/intern/libmv/libmv/simple_pipeline/modal_solver.cc diff --git a/extern/libmv/libmv/simple_pipeline/modal_solver.h b/intern/libmv/libmv/simple_pipeline/modal_solver.h index 9801fd21d81..9801fd21d81 100644 --- a/extern/libmv/libmv/simple_pipeline/modal_solver.h +++ b/intern/libmv/libmv/simple_pipeline/modal_solver.h diff --git a/extern/libmv/libmv/simple_pipeline/modal_solver_test.cc b/intern/libmv/libmv/simple_pipeline/modal_solver_test.cc index 8b87acd95bb..8b87acd95bb 100644 --- a/extern/libmv/libmv/simple_pipeline/modal_solver_test.cc +++ b/intern/libmv/libmv/simple_pipeline/modal_solver_test.cc diff --git a/extern/libmv/libmv/simple_pipeline/pipeline.cc b/intern/libmv/libmv/simple_pipeline/pipeline.cc index 6c8592baa00..6c8592baa00 100644 --- a/extern/libmv/libmv/simple_pipeline/pipeline.cc +++ b/intern/libmv/libmv/simple_pipeline/pipeline.cc diff --git a/extern/libmv/libmv/simple_pipeline/pipeline.h b/intern/libmv/libmv/simple_pipeline/pipeline.h index 4d1bd00c51f..4d1bd00c51f 100644 --- a/extern/libmv/libmv/simple_pipeline/pipeline.h +++ b/intern/libmv/libmv/simple_pipeline/pipeline.h diff --git a/extern/libmv/libmv/simple_pipeline/reconstruction.cc b/intern/libmv/libmv/simple_pipeline/reconstruction.cc index 65e5dd27d5d..65e5dd27d5d 100644 --- a/extern/libmv/libmv/simple_pipeline/reconstruction.cc +++ b/intern/libmv/libmv/simple_pipeline/reconstruction.cc diff --git a/extern/libmv/libmv/simple_pipeline/reconstruction.h b/intern/libmv/libmv/simple_pipeline/reconstruction.h index 947a0636476..947a0636476 100644 --- a/extern/libmv/libmv/simple_pipeline/reconstruction.h +++ b/intern/libmv/libmv/simple_pipeline/reconstruction.h diff --git a/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc b/intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc index 40ac23be7a2..40ac23be7a2 100644 --- a/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc +++ b/intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc diff --git a/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h b/intern/libmv/libmv/simple_pipeline/reconstruction_scale.h index f2349ff5146..f2349ff5146 100644 --- a/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h +++ b/intern/libmv/libmv/simple_pipeline/reconstruction_scale.h diff --git a/extern/libmv/libmv/simple_pipeline/resect.cc b/intern/libmv/libmv/simple_pipeline/resect.cc index e73fc44df2a..e73fc44df2a 100644 --- a/extern/libmv/libmv/simple_pipeline/resect.cc +++ b/intern/libmv/libmv/simple_pipeline/resect.cc diff --git a/extern/libmv/libmv/simple_pipeline/resect.h b/intern/libmv/libmv/simple_pipeline/resect.h index 7ca3237437e..7ca3237437e 100644 --- a/extern/libmv/libmv/simple_pipeline/resect.h +++ b/intern/libmv/libmv/simple_pipeline/resect.h diff --git a/extern/libmv/libmv/simple_pipeline/resect_test.cc b/intern/libmv/libmv/simple_pipeline/resect_test.cc index 811edd282d8..811edd282d8 100644 --- a/extern/libmv/libmv/simple_pipeline/resect_test.cc +++ b/intern/libmv/libmv/simple_pipeline/resect_test.cc diff --git a/extern/libmv/libmv/simple_pipeline/tracks.cc b/intern/libmv/libmv/simple_pipeline/tracks.cc index d5d009708ba..d5d009708ba 100644 --- a/extern/libmv/libmv/simple_pipeline/tracks.cc +++ b/intern/libmv/libmv/simple_pipeline/tracks.cc diff --git a/extern/libmv/libmv/simple_pipeline/tracks.h b/intern/libmv/libmv/simple_pipeline/tracks.h index a54a43659b7..a54a43659b7 100644 --- a/extern/libmv/libmv/simple_pipeline/tracks.h +++ b/intern/libmv/libmv/simple_pipeline/tracks.h diff --git a/extern/libmv/libmv/tracking/brute_region_tracker.cc b/intern/libmv/libmv/tracking/brute_region_tracker.cc index 4a2aef63a96..4a2aef63a96 100644 --- a/extern/libmv/libmv/tracking/brute_region_tracker.cc +++ b/intern/libmv/libmv/tracking/brute_region_tracker.cc diff --git a/extern/libmv/libmv/tracking/brute_region_tracker.h b/intern/libmv/libmv/tracking/brute_region_tracker.h index a699c42ee92..a699c42ee92 100644 --- a/extern/libmv/libmv/tracking/brute_region_tracker.h +++ b/intern/libmv/libmv/tracking/brute_region_tracker.h diff --git a/extern/libmv/libmv/tracking/brute_region_tracker_test.cc b/intern/libmv/libmv/tracking/brute_region_tracker_test.cc index 9014797c7cf..9014797c7cf 100644 --- a/extern/libmv/libmv/tracking/brute_region_tracker_test.cc +++ b/intern/libmv/libmv/tracking/brute_region_tracker_test.cc diff --git a/extern/libmv/libmv/tracking/hybrid_region_tracker.cc b/intern/libmv/libmv/tracking/hybrid_region_tracker.cc index ea3b0f5bfc0..ea3b0f5bfc0 100644 --- a/extern/libmv/libmv/tracking/hybrid_region_tracker.cc +++ b/intern/libmv/libmv/tracking/hybrid_region_tracker.cc diff --git a/extern/libmv/libmv/tracking/hybrid_region_tracker.h b/intern/libmv/libmv/tracking/hybrid_region_tracker.h index 967d2afd1e5..967d2afd1e5 100644 --- a/extern/libmv/libmv/tracking/hybrid_region_tracker.h +++ b/intern/libmv/libmv/tracking/hybrid_region_tracker.h diff --git a/extern/libmv/libmv/tracking/kalman_filter.h b/intern/libmv/libmv/tracking/kalman_filter.h index 9841f0e912c..9841f0e912c 100644 --- a/extern/libmv/libmv/tracking/kalman_filter.h +++ b/intern/libmv/libmv/tracking/kalman_filter.h diff --git a/extern/libmv/libmv/tracking/klt_region_tracker.cc b/intern/libmv/libmv/tracking/klt_region_tracker.cc index dbbf9f0b996..dbbf9f0b996 100644 --- a/extern/libmv/libmv/tracking/klt_region_tracker.cc +++ b/intern/libmv/libmv/tracking/klt_region_tracker.cc diff --git a/extern/libmv/libmv/tracking/klt_region_tracker.h b/intern/libmv/libmv/tracking/klt_region_tracker.h index 43977757084..43977757084 100644 --- a/extern/libmv/libmv/tracking/klt_region_tracker.h +++ b/intern/libmv/libmv/tracking/klt_region_tracker.h diff --git a/extern/libmv/libmv/tracking/klt_region_tracker_test.cc b/intern/libmv/libmv/tracking/klt_region_tracker_test.cc index 07d5d6500e3..07d5d6500e3 100644 --- a/extern/libmv/libmv/tracking/klt_region_tracker_test.cc +++ b/intern/libmv/libmv/tracking/klt_region_tracker_test.cc diff --git a/extern/libmv/libmv/tracking/pyramid_region_tracker.cc b/intern/libmv/libmv/tracking/pyramid_region_tracker.cc index 4db501050f3..4db501050f3 100644 --- a/extern/libmv/libmv/tracking/pyramid_region_tracker.cc +++ b/intern/libmv/libmv/tracking/pyramid_region_tracker.cc diff --git a/extern/libmv/libmv/tracking/pyramid_region_tracker.h b/intern/libmv/libmv/tracking/pyramid_region_tracker.h index 1f9675469f4..1f9675469f4 100644 --- a/extern/libmv/libmv/tracking/pyramid_region_tracker.h +++ b/intern/libmv/libmv/tracking/pyramid_region_tracker.h diff --git a/extern/libmv/libmv/tracking/pyramid_region_tracker_test.cc b/intern/libmv/libmv/tracking/pyramid_region_tracker_test.cc index d90a1012237..d90a1012237 100644 --- a/extern/libmv/libmv/tracking/pyramid_region_tracker_test.cc +++ b/intern/libmv/libmv/tracking/pyramid_region_tracker_test.cc diff --git a/extern/libmv/libmv/tracking/region_tracker.h b/intern/libmv/libmv/tracking/region_tracker.h index 4f7574df1a3..4f7574df1a3 100644 --- a/extern/libmv/libmv/tracking/region_tracker.h +++ b/intern/libmv/libmv/tracking/region_tracker.h diff --git a/extern/libmv/libmv/tracking/retrack_region_tracker.cc b/intern/libmv/libmv/tracking/retrack_region_tracker.cc index 4d230086d28..4d230086d28 100644 --- a/extern/libmv/libmv/tracking/retrack_region_tracker.cc +++ b/intern/libmv/libmv/tracking/retrack_region_tracker.cc diff --git a/extern/libmv/libmv/tracking/retrack_region_tracker.h b/intern/libmv/libmv/tracking/retrack_region_tracker.h index ab05f320834..ab05f320834 100644 --- a/extern/libmv/libmv/tracking/retrack_region_tracker.h +++ b/intern/libmv/libmv/tracking/retrack_region_tracker.h diff --git a/extern/libmv/libmv/tracking/track_region.cc b/intern/libmv/libmv/tracking/track_region.cc index ef6dac65236..ef6dac65236 100644 --- a/extern/libmv/libmv/tracking/track_region.cc +++ b/intern/libmv/libmv/tracking/track_region.cc diff --git a/extern/libmv/libmv/tracking/track_region.h b/intern/libmv/libmv/tracking/track_region.h index be1d8ef3e03..be1d8ef3e03 100644 --- a/extern/libmv/libmv/tracking/track_region.h +++ b/intern/libmv/libmv/tracking/track_region.h diff --git a/extern/libmv/libmv/tracking/trklt_region_tracker.cc b/intern/libmv/libmv/tracking/trklt_region_tracker.cc index 05ef3d1d272..05ef3d1d272 100644 --- a/extern/libmv/libmv/tracking/trklt_region_tracker.cc +++ b/intern/libmv/libmv/tracking/trklt_region_tracker.cc diff --git a/extern/libmv/libmv/tracking/trklt_region_tracker.h b/intern/libmv/libmv/tracking/trklt_region_tracker.h index 26d0621aa02..26d0621aa02 100644 --- a/extern/libmv/libmv/tracking/trklt_region_tracker.h +++ b/intern/libmv/libmv/tracking/trklt_region_tracker.h diff --git a/extern/libmv/mkfiles.sh b/intern/libmv/mkfiles.sh index 618070f0a81..618070f0a81 100755 --- a/extern/libmv/mkfiles.sh +++ b/intern/libmv/mkfiles.sh diff --git a/extern/libmv/third_party/msinttypes/README.libmv b/intern/libmv/third_party/msinttypes/README.libmv index 423f599b4ad..423f599b4ad 100644 --- a/extern/libmv/third_party/msinttypes/README.libmv +++ b/intern/libmv/third_party/msinttypes/README.libmv diff --git a/extern/libmv/third_party/msinttypes/inttypes.h b/intern/libmv/third_party/msinttypes/inttypes.h index 0e8af69cb07..0e8af69cb07 100644 --- a/extern/libmv/third_party/msinttypes/inttypes.h +++ b/intern/libmv/third_party/msinttypes/inttypes.h diff --git a/extern/libmv/third_party/msinttypes/stdint.h b/intern/libmv/third_party/msinttypes/stdint.h index 189ee34571c..189ee34571c 100644 --- a/extern/libmv/third_party/msinttypes/stdint.h +++ b/intern/libmv/third_party/msinttypes/stdint.h diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 0865efb5ba7..95414db9610 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -49,7 +49,7 @@ set(INC ../../../intern/raskter ../../../intern/smoke/extern ../../../intern/atomic - ../../../extern/libmv + ../../../intern/libmv # XXX - BAD LEVEL CALL WM_api.h ../windowmanager diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index c4ae82cf1aa..03fcab8dfb0 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -173,7 +173,7 @@ endif() bf_intern_eigen extern_rangetree extern_wcwidth - extern_libmv + bf_intern_libmv extern_glog extern_gflags extern_sdlew diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9bbf4d97092..3c79465c940 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -49,7 +49,7 @@ if(WIN32) endif() if(WITH_LIBMV) - blender_include_dirs(../../extern/libmv) + blender_include_dirs(../../intern/libmv) add_definitions(-DWITH_LIBMV) endif() |