From ba432299cdd4382130103cf5a84c34693d4a3bdc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 4 Jan 2016 18:22:27 +0500 Subject: [PATCH] Move Libmv from extern/ to intern/ Logically it is intern library since being mainly developed by 1.5 blender guys. --- build_files/cmake/macros.cmake | 2 +- extern/CMakeLists.txt | 1 - intern/CMakeLists.txt | 1 + {extern => intern}/libmv/CMakeLists.txt | 20 +++++++++---------- {extern => intern}/libmv/ChangeLog | 0 {extern => intern}/libmv/bundle.sh | 20 +++++++++---------- {extern => intern}/libmv/files.txt | 0 {extern => intern}/libmv/intern/autotrack.cc | 0 {extern => intern}/libmv/intern/autotrack.h | 0 .../libmv/intern/camera_intrinsics.cc | 0 .../libmv/intern/camera_intrinsics.h | 0 {extern => intern}/libmv/intern/detector.cc | 0 {extern => intern}/libmv/intern/detector.h | 0 .../libmv/intern/frame_accessor.cc | 0 .../libmv/intern/frame_accessor.h | 0 {extern => intern}/libmv/intern/homography.cc | 0 {extern => intern}/libmv/intern/homography.h | 0 {extern => intern}/libmv/intern/image.cc | 0 {extern => intern}/libmv/intern/image.h | 0 {extern => intern}/libmv/intern/logging.cc | 0 {extern => intern}/libmv/intern/logging.h | 0 .../libmv/intern/reconstruction.cc | 0 .../libmv/intern/reconstruction.h | 0 {extern => intern}/libmv/intern/region.h | 0 {extern => intern}/libmv/intern/stub.cc | 0 .../libmv/intern/track_region.cc | 0 .../libmv/intern/track_region.h | 0 {extern => intern}/libmv/intern/tracks.cc | 0 {extern => intern}/libmv/intern/tracks.h | 0 {extern => intern}/libmv/intern/tracksN.cc | 0 {extern => intern}/libmv/intern/tracksN.h | 0 {extern => intern}/libmv/intern/utildefines.h | 0 {extern => intern}/libmv/libmv-capi.h | 0 .../libmv/libmv/autotrack/autotrack.cc | 0 .../libmv/libmv/autotrack/autotrack.h | 0 .../libmv/libmv/autotrack/callbacks.h | 0 .../libmv/libmv/autotrack/frame_accessor.h | 0 .../libmv/libmv/autotrack/marker.h | 0 .../libmv/libmv/autotrack/model.h | 0 .../libmv/libmv/autotrack/predict_tracks.cc | 0 .../libmv/libmv/autotrack/predict_tracks.h | 0 .../libmv/autotrack/predict_tracks_test.cc | 0 .../libmv/libmv/autotrack/quad.h | 0 .../libmv/libmv/autotrack/reconstruction.h | 0 .../libmv/libmv/autotrack/region.h | 0 .../libmv/libmv/autotrack/tracks.cc | 0 .../libmv/libmv/autotrack/tracks.h | 0 .../libmv/libmv/autotrack/tracks_test.cc | 0 .../libmv/libmv/base/aligned_malloc.cc | 0 .../libmv/libmv/base/aligned_malloc.h | 0 .../libmv/libmv/base/id_generator.h | 0 .../libmv/libmv/base/scoped_ptr.h | 0 .../libmv/libmv/base/scoped_ptr_test.cc | 0 {extern => intern}/libmv/libmv/base/vector.h | 0 .../libmv/libmv/base/vector_test.cc | 0 .../libmv/libmv/base/vector_utils.h | 0 .../libmv/libmv/image/array_nd.cc | 0 .../libmv/libmv/image/array_nd.h | 0 .../libmv/libmv/image/array_nd_test.cc | 0 .../libmv/libmv/image/convolve.cc | 0 .../libmv/libmv/image/convolve.h | 0 .../libmv/libmv/image/convolve_test.cc | 0 .../libmv/libmv/image/correlation.h | 0 {extern => intern}/libmv/libmv/image/image.h | 0 .../libmv/libmv/image/image_converter.h | 0 .../libmv/libmv/image/image_drawing.h | 0 .../libmv/libmv/image/image_test.cc | 0 {extern => intern}/libmv/libmv/image/sample.h | 0 .../libmv/libmv/image/sample_test.cc | 0 {extern => intern}/libmv/libmv/image/tuple.h | 0 .../libmv/libmv/image/tuple_test.cc | 0 .../libmv/libmv/logging/logging.h | 0 .../libmv/libmv/multiview/conditioning.cc | 0 .../libmv/libmv/multiview/conditioning.h | 0 .../libmv/multiview/euclidean_resection.cc | 0 .../libmv/multiview/euclidean_resection.h | 0 .../multiview/euclidean_resection_test.cc | 0 .../libmv/libmv/multiview/fundamental.cc | 0 .../libmv/libmv/multiview/fundamental.h | 0 .../libmv/libmv/multiview/fundamental_test.cc | 0 .../libmv/libmv/multiview/homography.cc | 0 .../libmv/libmv/multiview/homography.h | 0 .../libmv/libmv/multiview/homography_error.h | 0 .../multiview/homography_parameterization.h | 0 .../libmv/libmv/multiview/homography_test.cc | 0 .../libmv/multiview/nviewtriangulation.h | 0 .../multiview/nviewtriangulation_test.cc | 0 .../libmv/libmv/multiview/panography.cc | 0 .../libmv/libmv/multiview/panography.h | 0 .../libmv/multiview/panography_kernel.cc | 0 .../libmv/libmv/multiview/panography_kernel.h | 0 .../libmv/libmv/multiview/panography_test.cc | 0 .../libmv/libmv/multiview/projection.cc | 0 .../libmv/libmv/multiview/projection.h | 0 .../libmv/libmv/multiview/projection_test.cc | 0 .../libmv/libmv/multiview/resection.h | 0 .../libmv/libmv/multiview/resection_test.cc | 0 .../libmv/libmv/multiview/test_data_sets.cc | 0 .../libmv/libmv/multiview/test_data_sets.h | 0 .../libmv/libmv/multiview/triangulation.cc | 0 .../libmv/libmv/multiview/triangulation.h | 0 .../libmv/multiview/triangulation_test.cc | 0 .../libmv/libmv/multiview/two_view_kernel.h | 0 .../libmv/libmv/numeric/dogleg.h | 0 .../libmv/libmv/numeric/dogleg_test.cc | 0 .../libmv/libmv/numeric/function_derivative.h | 0 .../libmv/numeric/function_derivative_test.cc | 0 .../libmv/libmv/numeric/levenberg_marquardt.h | 0 .../libmv/numeric/levenberg_marquardt_test.cc | 0 .../libmv/libmv/numeric/numeric.cc | 0 .../libmv/libmv/numeric/numeric.h | 0 .../libmv/libmv/numeric/numeric_test.cc | 0 .../libmv/libmv/numeric/poly.cc | 0 {extern => intern}/libmv/libmv/numeric/poly.h | 0 .../libmv/libmv/numeric/poly_test.cc | 0 .../libmv/libmv/simple_pipeline/bundle.cc | 0 .../libmv/libmv/simple_pipeline/bundle.h | 0 .../libmv/libmv/simple_pipeline/callbacks.h | 0 .../simple_pipeline/camera_intrinsics.cc | 0 .../libmv/simple_pipeline/camera_intrinsics.h | 0 .../simple_pipeline/camera_intrinsics_impl.h | 0 .../simple_pipeline/camera_intrinsics_test.cc | 0 .../libmv/libmv/simple_pipeline/detect.cc | 0 .../libmv/libmv/simple_pipeline/detect.h | 0 .../libmv/simple_pipeline/detect_test.cc | 0 .../simple_pipeline/distortion_models.cc | 0 .../libmv/simple_pipeline/distortion_models.h | 0 .../initialize_reconstruction.cc | 0 .../initialize_reconstruction.h | 0 .../libmv/libmv/simple_pipeline/intersect.cc | 0 .../libmv/libmv/simple_pipeline/intersect.h | 0 .../libmv/simple_pipeline/intersect_test.cc | 0 .../simple_pipeline/keyframe_selection.cc | 0 .../simple_pipeline/keyframe_selection.h | 0 .../keyframe_selection_test.cc | 0 .../libmv/simple_pipeline/modal_solver.cc | 0 .../libmv/simple_pipeline/modal_solver.h | 0 .../simple_pipeline/modal_solver_test.cc | 0 .../libmv/libmv/simple_pipeline/pipeline.cc | 0 .../libmv/libmv/simple_pipeline/pipeline.h | 0 .../libmv/simple_pipeline/reconstruction.cc | 0 .../libmv/simple_pipeline/reconstruction.h | 0 .../simple_pipeline/reconstruction_scale.cc | 0 .../simple_pipeline/reconstruction_scale.h | 0 .../libmv/libmv/simple_pipeline/resect.cc | 0 .../libmv/libmv/simple_pipeline/resect.h | 0 .../libmv/simple_pipeline/resect_test.cc | 0 .../libmv/libmv/simple_pipeline/tracks.cc | 0 .../libmv/libmv/simple_pipeline/tracks.h | 0 .../libmv/tracking/brute_region_tracker.cc | 0 .../libmv/tracking/brute_region_tracker.h | 0 .../tracking/brute_region_tracker_test.cc | 0 .../libmv/tracking/hybrid_region_tracker.cc | 0 .../libmv/tracking/hybrid_region_tracker.h | 0 .../libmv/libmv/tracking/kalman_filter.h | 0 .../libmv/tracking/klt_region_tracker.cc | 0 .../libmv/libmv/tracking/klt_region_tracker.h | 0 .../libmv/tracking/klt_region_tracker_test.cc | 0 .../libmv/tracking/pyramid_region_tracker.cc | 0 .../libmv/tracking/pyramid_region_tracker.h | 0 .../tracking/pyramid_region_tracker_test.cc | 0 .../libmv/libmv/tracking/region_tracker.h | 0 .../libmv/tracking/retrack_region_tracker.cc | 0 .../libmv/tracking/retrack_region_tracker.h | 0 .../libmv/libmv/tracking/track_region.cc | 0 .../libmv/libmv/tracking/track_region.h | 0 .../libmv/tracking/trklt_region_tracker.cc | 0 .../libmv/tracking/trklt_region_tracker.h | 0 {extern => intern}/libmv/mkfiles.sh | 0 .../libmv/third_party/msinttypes/README.libmv | 0 .../libmv/third_party/msinttypes/inttypes.h | 0 .../libmv/third_party/msinttypes/stdint.h | 0 source/blender/blenkernel/CMakeLists.txt | 2 +- source/blenderplayer/CMakeLists.txt | 2 +- source/creator/CMakeLists.txt | 2 +- 175 files changed, 25 insertions(+), 25 deletions(-) rename {extern => intern}/libmv/CMakeLists.txt (97%) rename {extern => intern}/libmv/ChangeLog (100%) rename {extern => intern}/libmv/bundle.sh (93%) rename {extern => intern}/libmv/files.txt (100%) rename {extern => intern}/libmv/intern/autotrack.cc (100%) rename {extern => intern}/libmv/intern/autotrack.h (100%) rename {extern => intern}/libmv/intern/camera_intrinsics.cc (100%) rename {extern => intern}/libmv/intern/camera_intrinsics.h (100%) rename {extern => intern}/libmv/intern/detector.cc (100%) rename {extern => intern}/libmv/intern/detector.h (100%) rename {extern => intern}/libmv/intern/frame_accessor.cc (100%) rename {extern => intern}/libmv/intern/frame_accessor.h (100%) rename {extern => intern}/libmv/intern/homography.cc (100%) rename {extern => intern}/libmv/intern/homography.h (100%) rename {extern => intern}/libmv/intern/image.cc (100%) rename {extern => intern}/libmv/intern/image.h (100%) rename {extern => intern}/libmv/intern/logging.cc (100%) rename {extern => intern}/libmv/intern/logging.h (100%) rename {extern => intern}/libmv/intern/reconstruction.cc (100%) rename {extern => intern}/libmv/intern/reconstruction.h (100%) rename {extern => intern}/libmv/intern/region.h (100%) rename {extern => intern}/libmv/intern/stub.cc (100%) rename {extern => intern}/libmv/intern/track_region.cc (100%) rename {extern => intern}/libmv/intern/track_region.h (100%) rename {extern => intern}/libmv/intern/tracks.cc (100%) rename {extern => intern}/libmv/intern/tracks.h (100%) rename {extern => intern}/libmv/intern/tracksN.cc (100%) rename {extern => intern}/libmv/intern/tracksN.h (100%) rename {extern => intern}/libmv/intern/utildefines.h (100%) rename {extern => intern}/libmv/libmv-capi.h (100%) rename {extern => intern}/libmv/libmv/autotrack/autotrack.cc (100%) rename {extern => intern}/libmv/libmv/autotrack/autotrack.h (100%) rename {extern => intern}/libmv/libmv/autotrack/callbacks.h (100%) rename {extern => intern}/libmv/libmv/autotrack/frame_accessor.h (100%) rename {extern => intern}/libmv/libmv/autotrack/marker.h (100%) rename {extern => intern}/libmv/libmv/autotrack/model.h (100%) rename {extern => intern}/libmv/libmv/autotrack/predict_tracks.cc (100%) rename {extern => intern}/libmv/libmv/autotrack/predict_tracks.h (100%) rename {extern => intern}/libmv/libmv/autotrack/predict_tracks_test.cc (100%) rename {extern => intern}/libmv/libmv/autotrack/quad.h (100%) rename {extern => intern}/libmv/libmv/autotrack/reconstruction.h (100%) rename {extern => intern}/libmv/libmv/autotrack/region.h (100%) rename {extern => intern}/libmv/libmv/autotrack/tracks.cc (100%) rename {extern => intern}/libmv/libmv/autotrack/tracks.h (100%) rename {extern => intern}/libmv/libmv/autotrack/tracks_test.cc (100%) rename {extern => intern}/libmv/libmv/base/aligned_malloc.cc (100%) rename {extern => intern}/libmv/libmv/base/aligned_malloc.h (100%) rename {extern => intern}/libmv/libmv/base/id_generator.h (100%) rename {extern => intern}/libmv/libmv/base/scoped_ptr.h (100%) rename {extern => intern}/libmv/libmv/base/scoped_ptr_test.cc (100%) rename {extern => intern}/libmv/libmv/base/vector.h (100%) rename {extern => intern}/libmv/libmv/base/vector_test.cc (100%) rename {extern => intern}/libmv/libmv/base/vector_utils.h (100%) rename {extern => intern}/libmv/libmv/image/array_nd.cc (100%) rename {extern => intern}/libmv/libmv/image/array_nd.h (100%) rename {extern => intern}/libmv/libmv/image/array_nd_test.cc (100%) rename {extern => intern}/libmv/libmv/image/convolve.cc (100%) rename {extern => intern}/libmv/libmv/image/convolve.h (100%) rename {extern => intern}/libmv/libmv/image/convolve_test.cc (100%) rename {extern => intern}/libmv/libmv/image/correlation.h (100%) rename {extern => intern}/libmv/libmv/image/image.h (100%) rename {extern => intern}/libmv/libmv/image/image_converter.h (100%) rename {extern => intern}/libmv/libmv/image/image_drawing.h (100%) rename {extern => intern}/libmv/libmv/image/image_test.cc (100%) rename {extern => intern}/libmv/libmv/image/sample.h (100%) rename {extern => intern}/libmv/libmv/image/sample_test.cc (100%) rename {extern => intern}/libmv/libmv/image/tuple.h (100%) rename {extern => intern}/libmv/libmv/image/tuple_test.cc (100%) rename {extern => intern}/libmv/libmv/logging/logging.h (100%) rename {extern => intern}/libmv/libmv/multiview/conditioning.cc (100%) rename {extern => intern}/libmv/libmv/multiview/conditioning.h (100%) rename {extern => intern}/libmv/libmv/multiview/euclidean_resection.cc (100%) rename {extern => intern}/libmv/libmv/multiview/euclidean_resection.h (100%) rename {extern => intern}/libmv/libmv/multiview/euclidean_resection_test.cc (100%) rename {extern => intern}/libmv/libmv/multiview/fundamental.cc (100%) rename {extern => intern}/libmv/libmv/multiview/fundamental.h (100%) rename {extern => intern}/libmv/libmv/multiview/fundamental_test.cc (100%) rename {extern => intern}/libmv/libmv/multiview/homography.cc (100%) rename {extern => intern}/libmv/libmv/multiview/homography.h (100%) rename {extern => intern}/libmv/libmv/multiview/homography_error.h (100%) rename {extern => intern}/libmv/libmv/multiview/homography_parameterization.h (100%) rename {extern => intern}/libmv/libmv/multiview/homography_test.cc (100%) rename {extern => intern}/libmv/libmv/multiview/nviewtriangulation.h (100%) rename {extern => intern}/libmv/libmv/multiview/nviewtriangulation_test.cc (100%) rename {extern => intern}/libmv/libmv/multiview/panography.cc (100%) rename {extern => intern}/libmv/libmv/multiview/panography.h (100%) rename {extern => intern}/libmv/libmv/multiview/panography_kernel.cc (100%) rename {extern => intern}/libmv/libmv/multiview/panography_kernel.h (100%) rename {extern => intern}/libmv/libmv/multiview/panography_test.cc (100%) rename {extern => intern}/libmv/libmv/multiview/projection.cc (100%) rename {extern => intern}/libmv/libmv/multiview/projection.h (100%) rename {extern => intern}/libmv/libmv/multiview/projection_test.cc (100%) rename {extern => intern}/libmv/libmv/multiview/resection.h (100%) rename {extern => intern}/libmv/libmv/multiview/resection_test.cc (100%) rename {extern => intern}/libmv/libmv/multiview/test_data_sets.cc (100%) rename {extern => intern}/libmv/libmv/multiview/test_data_sets.h (100%) rename {extern => intern}/libmv/libmv/multiview/triangulation.cc (100%) rename {extern => intern}/libmv/libmv/multiview/triangulation.h (100%) rename {extern => intern}/libmv/libmv/multiview/triangulation_test.cc (100%) rename {extern => intern}/libmv/libmv/multiview/two_view_kernel.h (100%) rename {extern => intern}/libmv/libmv/numeric/dogleg.h (100%) rename {extern => intern}/libmv/libmv/numeric/dogleg_test.cc (100%) rename {extern => intern}/libmv/libmv/numeric/function_derivative.h (100%) rename {extern => intern}/libmv/libmv/numeric/function_derivative_test.cc (100%) rename {extern => intern}/libmv/libmv/numeric/levenberg_marquardt.h (100%) rename {extern => intern}/libmv/libmv/numeric/levenberg_marquardt_test.cc (100%) rename {extern => intern}/libmv/libmv/numeric/numeric.cc (100%) rename {extern => intern}/libmv/libmv/numeric/numeric.h (100%) rename {extern => intern}/libmv/libmv/numeric/numeric_test.cc (100%) rename {extern => intern}/libmv/libmv/numeric/poly.cc (100%) rename {extern => intern}/libmv/libmv/numeric/poly.h (100%) rename {extern => intern}/libmv/libmv/numeric/poly_test.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/bundle.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/bundle.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/callbacks.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/camera_intrinsics.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/camera_intrinsics.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/detect.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/detect.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/detect_test.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/distortion_models.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/distortion_models.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/initialize_reconstruction.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/initialize_reconstruction.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/intersect.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/intersect.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/intersect_test.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/keyframe_selection.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/keyframe_selection.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/keyframe_selection_test.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/modal_solver.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/modal_solver.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/modal_solver_test.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/pipeline.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/pipeline.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/reconstruction.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/reconstruction.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/reconstruction_scale.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/reconstruction_scale.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/resect.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/resect.h (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/resect_test.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/tracks.cc (100%) rename {extern => intern}/libmv/libmv/simple_pipeline/tracks.h (100%) rename {extern => intern}/libmv/libmv/tracking/brute_region_tracker.cc (100%) rename {extern => intern}/libmv/libmv/tracking/brute_region_tracker.h (100%) rename {extern => intern}/libmv/libmv/tracking/brute_region_tracker_test.cc (100%) rename {extern => intern}/libmv/libmv/tracking/hybrid_region_tracker.cc (100%) rename {extern => intern}/libmv/libmv/tracking/hybrid_region_tracker.h (100%) rename {extern => intern}/libmv/libmv/tracking/kalman_filter.h (100%) rename {extern => intern}/libmv/libmv/tracking/klt_region_tracker.cc (100%) rename {extern => intern}/libmv/libmv/tracking/klt_region_tracker.h (100%) rename {extern => intern}/libmv/libmv/tracking/klt_region_tracker_test.cc (100%) rename {extern => intern}/libmv/libmv/tracking/pyramid_region_tracker.cc (100%) rename {extern => intern}/libmv/libmv/tracking/pyramid_region_tracker.h (100%) rename {extern => intern}/libmv/libmv/tracking/pyramid_region_tracker_test.cc (100%) rename {extern => intern}/libmv/libmv/tracking/region_tracker.h (100%) rename {extern => intern}/libmv/libmv/tracking/retrack_region_tracker.cc (100%) rename {extern => intern}/libmv/libmv/tracking/retrack_region_tracker.h (100%) rename {extern => intern}/libmv/libmv/tracking/track_region.cc (100%) rename {extern => intern}/libmv/libmv/tracking/track_region.h (100%) rename {extern => intern}/libmv/libmv/tracking/trklt_region_tracker.cc (100%) rename {extern => intern}/libmv/libmv/tracking/trklt_region_tracker.h (100%) rename {extern => intern}/libmv/mkfiles.sh (100%) rename {extern => intern}/libmv/third_party/msinttypes/README.libmv (100%) rename {extern => intern}/libmv/third_party/msinttypes/inttypes.h (100%) rename {extern => intern}/libmv/third_party/msinttypes/stdint.h (100%) 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 similarity index 97% rename from extern/libmv/CMakeLists.txt rename to 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 similarity index 100% rename from extern/libmv/ChangeLog rename to intern/libmv/ChangeLog diff --git a/extern/libmv/bundle.sh b/intern/libmv/bundle.sh similarity index 93% rename from extern/libmv/bundle.sh rename to 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 similarity index 100% rename from extern/libmv/files.txt rename to intern/libmv/files.txt diff --git a/extern/libmv/intern/autotrack.cc b/intern/libmv/intern/autotrack.cc similarity index 100% rename from extern/libmv/intern/autotrack.cc rename to intern/libmv/intern/autotrack.cc diff --git a/extern/libmv/intern/autotrack.h b/intern/libmv/intern/autotrack.h similarity index 100% rename from extern/libmv/intern/autotrack.h rename to intern/libmv/intern/autotrack.h diff --git a/extern/libmv/intern/camera_intrinsics.cc b/intern/libmv/intern/camera_intrinsics.cc similarity index 100% rename from extern/libmv/intern/camera_intrinsics.cc rename to intern/libmv/intern/camera_intrinsics.cc diff --git a/extern/libmv/intern/camera_intrinsics.h b/intern/libmv/intern/camera_intrinsics.h similarity index 100% rename from extern/libmv/intern/camera_intrinsics.h rename to intern/libmv/intern/camera_intrinsics.h diff --git a/extern/libmv/intern/detector.cc b/intern/libmv/intern/detector.cc similarity index 100% rename from extern/libmv/intern/detector.cc rename to intern/libmv/intern/detector.cc diff --git a/extern/libmv/intern/detector.h b/intern/libmv/intern/detector.h similarity index 100% rename from extern/libmv/intern/detector.h rename to intern/libmv/intern/detector.h diff --git a/extern/libmv/intern/frame_accessor.cc b/intern/libmv/intern/frame_accessor.cc similarity index 100% rename from extern/libmv/intern/frame_accessor.cc rename to intern/libmv/intern/frame_accessor.cc diff --git a/extern/libmv/intern/frame_accessor.h b/intern/libmv/intern/frame_accessor.h similarity index 100% rename from extern/libmv/intern/frame_accessor.h rename to intern/libmv/intern/frame_accessor.h diff --git a/extern/libmv/intern/homography.cc b/intern/libmv/intern/homography.cc similarity index 100% rename from extern/libmv/intern/homography.cc rename to intern/libmv/intern/homography.cc diff --git a/extern/libmv/intern/homography.h b/intern/libmv/intern/homography.h similarity index 100% rename from extern/libmv/intern/homography.h rename to intern/libmv/intern/homography.h diff --git a/extern/libmv/intern/image.cc b/intern/libmv/intern/image.cc similarity index 100% rename from extern/libmv/intern/image.cc rename to intern/libmv/intern/image.cc diff --git a/extern/libmv/intern/image.h b/intern/libmv/intern/image.h similarity index 100% rename from extern/libmv/intern/image.h rename to intern/libmv/intern/image.h diff --git a/extern/libmv/intern/logging.cc b/intern/libmv/intern/logging.cc similarity index 100% rename from extern/libmv/intern/logging.cc rename to intern/libmv/intern/logging.cc diff --git a/extern/libmv/intern/logging.h b/intern/libmv/intern/logging.h similarity index 100% rename from extern/libmv/intern/logging.h rename to intern/libmv/intern/logging.h diff --git a/extern/libmv/intern/reconstruction.cc b/intern/libmv/intern/reconstruction.cc similarity index 100% rename from extern/libmv/intern/reconstruction.cc rename to intern/libmv/intern/reconstruction.cc diff --git a/extern/libmv/intern/reconstruction.h b/intern/libmv/intern/reconstruction.h similarity index 100% rename from extern/libmv/intern/reconstruction.h rename to intern/libmv/intern/reconstruction.h diff --git a/extern/libmv/intern/region.h b/intern/libmv/intern/region.h similarity index 100% rename from extern/libmv/intern/region.h rename to intern/libmv/intern/region.h diff --git a/extern/libmv/intern/stub.cc b/intern/libmv/intern/stub.cc similarity index 100% rename from extern/libmv/intern/stub.cc rename to intern/libmv/intern/stub.cc diff --git a/extern/libmv/intern/track_region.cc b/intern/libmv/intern/track_region.cc similarity index 100% rename from extern/libmv/intern/track_region.cc rename to intern/libmv/intern/track_region.cc diff --git a/extern/libmv/intern/track_region.h b/intern/libmv/intern/track_region.h similarity index 100% rename from extern/libmv/intern/track_region.h rename to intern/libmv/intern/track_region.h diff --git a/extern/libmv/intern/tracks.cc b/intern/libmv/intern/tracks.cc similarity index 100% rename from extern/libmv/intern/tracks.cc rename to intern/libmv/intern/tracks.cc diff --git a/extern/libmv/intern/tracks.h b/intern/libmv/intern/tracks.h similarity index 100% rename from extern/libmv/intern/tracks.h rename to intern/libmv/intern/tracks.h diff --git a/extern/libmv/intern/tracksN.cc b/intern/libmv/intern/tracksN.cc similarity index 100% rename from extern/libmv/intern/tracksN.cc rename to intern/libmv/intern/tracksN.cc diff --git a/extern/libmv/intern/tracksN.h b/intern/libmv/intern/tracksN.h similarity index 100% rename from extern/libmv/intern/tracksN.h rename to intern/libmv/intern/tracksN.h diff --git a/extern/libmv/intern/utildefines.h b/intern/libmv/intern/utildefines.h similarity index 100% rename from extern/libmv/intern/utildefines.h rename to intern/libmv/intern/utildefines.h diff --git a/extern/libmv/libmv-capi.h b/intern/libmv/libmv-capi.h similarity index 100% rename from extern/libmv/libmv-capi.h rename to intern/libmv/libmv-capi.h diff --git a/extern/libmv/libmv/autotrack/autotrack.cc b/intern/libmv/libmv/autotrack/autotrack.cc similarity index 100% rename from extern/libmv/libmv/autotrack/autotrack.cc rename to intern/libmv/libmv/autotrack/autotrack.cc diff --git a/extern/libmv/libmv/autotrack/autotrack.h b/intern/libmv/libmv/autotrack/autotrack.h similarity index 100% rename from extern/libmv/libmv/autotrack/autotrack.h rename to intern/libmv/libmv/autotrack/autotrack.h diff --git a/extern/libmv/libmv/autotrack/callbacks.h b/intern/libmv/libmv/autotrack/callbacks.h similarity index 100% rename from extern/libmv/libmv/autotrack/callbacks.h rename to intern/libmv/libmv/autotrack/callbacks.h diff --git a/extern/libmv/libmv/autotrack/frame_accessor.h b/intern/libmv/libmv/autotrack/frame_accessor.h similarity index 100% rename from extern/libmv/libmv/autotrack/frame_accessor.h rename to intern/libmv/libmv/autotrack/frame_accessor.h diff --git a/extern/libmv/libmv/autotrack/marker.h b/intern/libmv/libmv/autotrack/marker.h similarity index 100% rename from extern/libmv/libmv/autotrack/marker.h rename to intern/libmv/libmv/autotrack/marker.h diff --git a/extern/libmv/libmv/autotrack/model.h b/intern/libmv/libmv/autotrack/model.h similarity index 100% rename from extern/libmv/libmv/autotrack/model.h rename to intern/libmv/libmv/autotrack/model.h diff --git a/extern/libmv/libmv/autotrack/predict_tracks.cc b/intern/libmv/libmv/autotrack/predict_tracks.cc similarity index 100% rename from extern/libmv/libmv/autotrack/predict_tracks.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/autotrack/predict_tracks.h rename to 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 similarity index 100% rename from extern/libmv/libmv/autotrack/predict_tracks_test.cc rename to intern/libmv/libmv/autotrack/predict_tracks_test.cc diff --git a/extern/libmv/libmv/autotrack/quad.h b/intern/libmv/libmv/autotrack/quad.h similarity index 100% rename from extern/libmv/libmv/autotrack/quad.h rename to intern/libmv/libmv/autotrack/quad.h diff --git a/extern/libmv/libmv/autotrack/reconstruction.h b/intern/libmv/libmv/autotrack/reconstruction.h similarity index 100% rename from extern/libmv/libmv/autotrack/reconstruction.h rename to intern/libmv/libmv/autotrack/reconstruction.h diff --git a/extern/libmv/libmv/autotrack/region.h b/intern/libmv/libmv/autotrack/region.h similarity index 100% rename from extern/libmv/libmv/autotrack/region.h rename to intern/libmv/libmv/autotrack/region.h diff --git a/extern/libmv/libmv/autotrack/tracks.cc b/intern/libmv/libmv/autotrack/tracks.cc similarity index 100% rename from extern/libmv/libmv/autotrack/tracks.cc rename to intern/libmv/libmv/autotrack/tracks.cc diff --git a/extern/libmv/libmv/autotrack/tracks.h b/intern/libmv/libmv/autotrack/tracks.h similarity index 100% rename from extern/libmv/libmv/autotrack/tracks.h rename to intern/libmv/libmv/autotrack/tracks.h diff --git a/extern/libmv/libmv/autotrack/tracks_test.cc b/intern/libmv/libmv/autotrack/tracks_test.cc similarity index 100% rename from extern/libmv/libmv/autotrack/tracks_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/base/aligned_malloc.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/base/aligned_malloc.h rename to 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 similarity index 100% rename from extern/libmv/libmv/base/id_generator.h rename to 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 similarity index 100% rename from extern/libmv/libmv/base/scoped_ptr.h rename to 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 similarity index 100% rename from extern/libmv/libmv/base/scoped_ptr_test.cc rename to intern/libmv/libmv/base/scoped_ptr_test.cc diff --git a/extern/libmv/libmv/base/vector.h b/intern/libmv/libmv/base/vector.h similarity index 100% rename from extern/libmv/libmv/base/vector.h rename to intern/libmv/libmv/base/vector.h diff --git a/extern/libmv/libmv/base/vector_test.cc b/intern/libmv/libmv/base/vector_test.cc similarity index 100% rename from extern/libmv/libmv/base/vector_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/base/vector_utils.h rename to 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 similarity index 100% rename from extern/libmv/libmv/image/array_nd.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/image/array_nd.h rename to 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 similarity index 100% rename from extern/libmv/libmv/image/array_nd_test.cc rename to intern/libmv/libmv/image/array_nd_test.cc diff --git a/extern/libmv/libmv/image/convolve.cc b/intern/libmv/libmv/image/convolve.cc similarity index 100% rename from extern/libmv/libmv/image/convolve.cc rename to intern/libmv/libmv/image/convolve.cc diff --git a/extern/libmv/libmv/image/convolve.h b/intern/libmv/libmv/image/convolve.h similarity index 100% rename from extern/libmv/libmv/image/convolve.h rename to intern/libmv/libmv/image/convolve.h diff --git a/extern/libmv/libmv/image/convolve_test.cc b/intern/libmv/libmv/image/convolve_test.cc similarity index 100% rename from extern/libmv/libmv/image/convolve_test.cc rename to intern/libmv/libmv/image/convolve_test.cc diff --git a/extern/libmv/libmv/image/correlation.h b/intern/libmv/libmv/image/correlation.h similarity index 100% rename from extern/libmv/libmv/image/correlation.h rename to intern/libmv/libmv/image/correlation.h diff --git a/extern/libmv/libmv/image/image.h b/intern/libmv/libmv/image/image.h similarity index 100% rename from extern/libmv/libmv/image/image.h rename to intern/libmv/libmv/image/image.h diff --git a/extern/libmv/libmv/image/image_converter.h b/intern/libmv/libmv/image/image_converter.h similarity index 100% rename from extern/libmv/libmv/image/image_converter.h rename to 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 similarity index 100% rename from extern/libmv/libmv/image/image_drawing.h rename to 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 similarity index 100% rename from extern/libmv/libmv/image/image_test.cc rename to intern/libmv/libmv/image/image_test.cc diff --git a/extern/libmv/libmv/image/sample.h b/intern/libmv/libmv/image/sample.h similarity index 100% rename from extern/libmv/libmv/image/sample.h rename to intern/libmv/libmv/image/sample.h diff --git a/extern/libmv/libmv/image/sample_test.cc b/intern/libmv/libmv/image/sample_test.cc similarity index 100% rename from extern/libmv/libmv/image/sample_test.cc rename to intern/libmv/libmv/image/sample_test.cc diff --git a/extern/libmv/libmv/image/tuple.h b/intern/libmv/libmv/image/tuple.h similarity index 100% rename from extern/libmv/libmv/image/tuple.h rename to intern/libmv/libmv/image/tuple.h diff --git a/extern/libmv/libmv/image/tuple_test.cc b/intern/libmv/libmv/image/tuple_test.cc similarity index 100% rename from extern/libmv/libmv/image/tuple_test.cc rename to intern/libmv/libmv/image/tuple_test.cc diff --git a/extern/libmv/libmv/logging/logging.h b/intern/libmv/libmv/logging/logging.h similarity index 100% rename from extern/libmv/libmv/logging/logging.h rename to intern/libmv/libmv/logging/logging.h diff --git a/extern/libmv/libmv/multiview/conditioning.cc b/intern/libmv/libmv/multiview/conditioning.cc similarity index 100% rename from extern/libmv/libmv/multiview/conditioning.cc rename to intern/libmv/libmv/multiview/conditioning.cc diff --git a/extern/libmv/libmv/multiview/conditioning.h b/intern/libmv/libmv/multiview/conditioning.h similarity index 100% rename from extern/libmv/libmv/multiview/conditioning.h rename to intern/libmv/libmv/multiview/conditioning.h diff --git a/extern/libmv/libmv/multiview/euclidean_resection.cc b/intern/libmv/libmv/multiview/euclidean_resection.cc similarity index 100% rename from extern/libmv/libmv/multiview/euclidean_resection.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/euclidean_resection.h rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/euclidean_resection_test.cc rename to intern/libmv/libmv/multiview/euclidean_resection_test.cc diff --git a/extern/libmv/libmv/multiview/fundamental.cc b/intern/libmv/libmv/multiview/fundamental.cc similarity index 100% rename from extern/libmv/libmv/multiview/fundamental.cc rename to intern/libmv/libmv/multiview/fundamental.cc diff --git a/extern/libmv/libmv/multiview/fundamental.h b/intern/libmv/libmv/multiview/fundamental.h similarity index 100% rename from extern/libmv/libmv/multiview/fundamental.h rename to intern/libmv/libmv/multiview/fundamental.h diff --git a/extern/libmv/libmv/multiview/fundamental_test.cc b/intern/libmv/libmv/multiview/fundamental_test.cc similarity index 100% rename from extern/libmv/libmv/multiview/fundamental_test.cc rename to intern/libmv/libmv/multiview/fundamental_test.cc diff --git a/extern/libmv/libmv/multiview/homography.cc b/intern/libmv/libmv/multiview/homography.cc similarity index 100% rename from extern/libmv/libmv/multiview/homography.cc rename to intern/libmv/libmv/multiview/homography.cc diff --git a/extern/libmv/libmv/multiview/homography.h b/intern/libmv/libmv/multiview/homography.h similarity index 100% rename from extern/libmv/libmv/multiview/homography.h rename to intern/libmv/libmv/multiview/homography.h diff --git a/extern/libmv/libmv/multiview/homography_error.h b/intern/libmv/libmv/multiview/homography_error.h similarity index 100% rename from extern/libmv/libmv/multiview/homography_error.h rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/homography_parameterization.h rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/homography_test.cc rename to intern/libmv/libmv/multiview/homography_test.cc diff --git a/extern/libmv/libmv/multiview/nviewtriangulation.h b/intern/libmv/libmv/multiview/nviewtriangulation.h similarity index 100% rename from extern/libmv/libmv/multiview/nviewtriangulation.h rename to intern/libmv/libmv/multiview/nviewtriangulation.h diff --git a/extern/libmv/libmv/multiview/nviewtriangulation_test.cc b/intern/libmv/libmv/multiview/nviewtriangulation_test.cc similarity index 100% rename from extern/libmv/libmv/multiview/nviewtriangulation_test.cc rename to intern/libmv/libmv/multiview/nviewtriangulation_test.cc diff --git a/extern/libmv/libmv/multiview/panography.cc b/intern/libmv/libmv/multiview/panography.cc similarity index 100% rename from extern/libmv/libmv/multiview/panography.cc rename to intern/libmv/libmv/multiview/panography.cc diff --git a/extern/libmv/libmv/multiview/panography.h b/intern/libmv/libmv/multiview/panography.h similarity index 100% rename from extern/libmv/libmv/multiview/panography.h rename to intern/libmv/libmv/multiview/panography.h diff --git a/extern/libmv/libmv/multiview/panography_kernel.cc b/intern/libmv/libmv/multiview/panography_kernel.cc similarity index 100% rename from extern/libmv/libmv/multiview/panography_kernel.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/panography_kernel.h rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/panography_test.cc rename to intern/libmv/libmv/multiview/panography_test.cc diff --git a/extern/libmv/libmv/multiview/projection.cc b/intern/libmv/libmv/multiview/projection.cc similarity index 100% rename from extern/libmv/libmv/multiview/projection.cc rename to intern/libmv/libmv/multiview/projection.cc diff --git a/extern/libmv/libmv/multiview/projection.h b/intern/libmv/libmv/multiview/projection.h similarity index 100% rename from extern/libmv/libmv/multiview/projection.h rename to intern/libmv/libmv/multiview/projection.h diff --git a/extern/libmv/libmv/multiview/projection_test.cc b/intern/libmv/libmv/multiview/projection_test.cc similarity index 100% rename from extern/libmv/libmv/multiview/projection_test.cc rename to intern/libmv/libmv/multiview/projection_test.cc diff --git a/extern/libmv/libmv/multiview/resection.h b/intern/libmv/libmv/multiview/resection.h similarity index 100% rename from extern/libmv/libmv/multiview/resection.h rename to intern/libmv/libmv/multiview/resection.h diff --git a/extern/libmv/libmv/multiview/resection_test.cc b/intern/libmv/libmv/multiview/resection_test.cc similarity index 100% rename from extern/libmv/libmv/multiview/resection_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/test_data_sets.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/test_data_sets.h rename to intern/libmv/libmv/multiview/test_data_sets.h diff --git a/extern/libmv/libmv/multiview/triangulation.cc b/intern/libmv/libmv/multiview/triangulation.cc similarity index 100% rename from extern/libmv/libmv/multiview/triangulation.cc rename to intern/libmv/libmv/multiview/triangulation.cc diff --git a/extern/libmv/libmv/multiview/triangulation.h b/intern/libmv/libmv/multiview/triangulation.h similarity index 100% rename from extern/libmv/libmv/multiview/triangulation.h rename to intern/libmv/libmv/multiview/triangulation.h diff --git a/extern/libmv/libmv/multiview/triangulation_test.cc b/intern/libmv/libmv/multiview/triangulation_test.cc similarity index 100% rename from extern/libmv/libmv/multiview/triangulation_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/multiview/two_view_kernel.h rename to intern/libmv/libmv/multiview/two_view_kernel.h diff --git a/extern/libmv/libmv/numeric/dogleg.h b/intern/libmv/libmv/numeric/dogleg.h similarity index 100% rename from extern/libmv/libmv/numeric/dogleg.h rename to intern/libmv/libmv/numeric/dogleg.h diff --git a/extern/libmv/libmv/numeric/dogleg_test.cc b/intern/libmv/libmv/numeric/dogleg_test.cc similarity index 100% rename from extern/libmv/libmv/numeric/dogleg_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/numeric/function_derivative.h rename to 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 similarity index 100% rename from extern/libmv/libmv/numeric/function_derivative_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/numeric/levenberg_marquardt.h rename to 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 similarity index 100% rename from extern/libmv/libmv/numeric/levenberg_marquardt_test.cc rename to intern/libmv/libmv/numeric/levenberg_marquardt_test.cc diff --git a/extern/libmv/libmv/numeric/numeric.cc b/intern/libmv/libmv/numeric/numeric.cc similarity index 100% rename from extern/libmv/libmv/numeric/numeric.cc rename to intern/libmv/libmv/numeric/numeric.cc diff --git a/extern/libmv/libmv/numeric/numeric.h b/intern/libmv/libmv/numeric/numeric.h similarity index 100% rename from extern/libmv/libmv/numeric/numeric.h rename to intern/libmv/libmv/numeric/numeric.h diff --git a/extern/libmv/libmv/numeric/numeric_test.cc b/intern/libmv/libmv/numeric/numeric_test.cc similarity index 100% rename from extern/libmv/libmv/numeric/numeric_test.cc rename to intern/libmv/libmv/numeric/numeric_test.cc diff --git a/extern/libmv/libmv/numeric/poly.cc b/intern/libmv/libmv/numeric/poly.cc similarity index 100% rename from extern/libmv/libmv/numeric/poly.cc rename to intern/libmv/libmv/numeric/poly.cc diff --git a/extern/libmv/libmv/numeric/poly.h b/intern/libmv/libmv/numeric/poly.h similarity index 100% rename from extern/libmv/libmv/numeric/poly.h rename to intern/libmv/libmv/numeric/poly.h diff --git a/extern/libmv/libmv/numeric/poly_test.cc b/intern/libmv/libmv/numeric/poly_test.cc similarity index 100% rename from extern/libmv/libmv/numeric/poly_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/bundle.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/bundle.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/callbacks.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/camera_intrinsics.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/detect.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/detect.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/detect_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/distortion_models.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/distortion_models.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/intersect.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/intersect.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/intersect_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/keyframe_selection.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/keyframe_selection.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/modal_solver.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/modal_solver.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/modal_solver_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/pipeline.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/pipeline.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/reconstruction.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/reconstruction.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/reconstruction_scale.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/resect.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/resect.h rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/resect_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/tracks.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/simple_pipeline/tracks.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/brute_region_tracker.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/brute_region_tracker.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/brute_region_tracker_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/hybrid_region_tracker.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/hybrid_region_tracker.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/kalman_filter.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/klt_region_tracker.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/klt_region_tracker.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/klt_region_tracker_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/pyramid_region_tracker.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/pyramid_region_tracker.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/pyramid_region_tracker_test.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/region_tracker.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/retrack_region_tracker.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/retrack_region_tracker.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/track_region.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/track_region.h rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/trklt_region_tracker.cc rename to 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 similarity index 100% rename from extern/libmv/libmv/tracking/trklt_region_tracker.h rename to intern/libmv/libmv/tracking/trklt_region_tracker.h diff --git a/extern/libmv/mkfiles.sh b/intern/libmv/mkfiles.sh similarity index 100% rename from extern/libmv/mkfiles.sh rename to intern/libmv/mkfiles.sh diff --git a/extern/libmv/third_party/msinttypes/README.libmv b/intern/libmv/third_party/msinttypes/README.libmv similarity index 100% rename from extern/libmv/third_party/msinttypes/README.libmv rename to 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 similarity index 100% rename from extern/libmv/third_party/msinttypes/inttypes.h rename to 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 similarity index 100% rename from extern/libmv/third_party/msinttypes/stdint.h rename to 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()