[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56730] branches/soc-2011-tomato: Merging r56725 through r56729 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Mon May 13 00:27:39 CEST 2013


Revision: 56730
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56730
Author:   nazgul
Date:     2013-05-12 22:27:39 +0000 (Sun, 12 May 2013)
Log Message:
-----------
Merging r56725 through r56729 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/CMakeLists.txt
    branches/soc-2011-tomato/extern/SConscript
    branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
    branches/soc-2011-tomato/extern/libmv/SConscript
    branches/soc-2011-tomato/extern/libmv/bundle.sh
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenkernel/SConscript
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-tomato/source/creator/CMakeLists.txt

Added Paths:
-----------
    branches/soc-2011-tomato/extern/libmv/libmv-capi.cc
    branches/soc-2011-tomato/extern/libmv/libmv-capi_stub.cc

Removed Paths:
-------------
    branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-56724
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-56729

Modified: branches/soc-2011-tomato/extern/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/CMakeLists.txt	2013-05-12 22:17:37 UTC (rev 56729)
+++ branches/soc-2011-tomato/extern/CMakeLists.txt	2013-05-12 22:27:39 UTC (rev 56730)
@@ -29,6 +29,7 @@
 add_subdirectory(colamd)
 add_subdirectory(rangetree)
 add_subdirectory(wcwidth)
+add_subdirectory(libmv)
 
 if(WITH_BULLET)
 	if(NOT WITH_SYSTEM_BULLET)
@@ -69,10 +70,6 @@
 	add_subdirectory(lzma)
 endif()
 
-if(WITH_LIBMV)
-	add_subdirectory(libmv)
-endif()
-
 if(WITH_MOD_BOOLEAN)
 	add_subdirectory(carve)
 endif()

Modified: branches/soc-2011-tomato/extern/SConscript
===================================================================
--- branches/soc-2011-tomato/extern/SConscript	2013-05-12 22:17:37 UTC (rev 56729)
+++ branches/soc-2011-tomato/extern/SConscript	2013-05-12 22:27:39 UTC (rev 56730)
@@ -6,6 +6,7 @@
 SConscript(['colamd/SConscript'])
 SConscript(['rangetree/SConscript'])
 SConscript(['wcwidth/SConscript'])
+SConscript(['libmv/SConscript'])
 
 if env['WITH_BF_GAMEENGINE']:
     SConscript(['recastnavigation/SConscript'])
@@ -34,9 +35,6 @@
 if env['WITH_BF_LZMA']:
     SConscript(['lzma/SConscript'])
 
-if env['WITH_BF_LIBMV']:
-    SConscript(['libmv/SConscript'])
-
 if env['WITH_BF_BOOLEAN']:
     SConscript(['carve/SConscript'])
 

Modified: branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/libmv/CMakeLists.txt	2013-05-12 22:17:37 UTC (rev 56729)
+++ branches/soc-2011-tomato/extern/libmv/CMakeLists.txt	2013-05-12 22:27:39 UTC (rev 56730)
@@ -28,200 +28,218 @@
 
 set(INC
 	.
-	third_party/ceres/include
 )
 
-set(INC_SYS
-	../Eigen3
-	${PNG_INCLUDE_DIR}
-	${ZLIB_INCLUDE_DIRS}
+set(SRC
+	libmv-capi.h
 )
 
-set(SRC
-	libmv-capi.cpp
-	libmv/image/array_nd.cc
-	libmv/image/convolve.cc
-	libmv/multiview/conditioning.cc
-	libmv/multiview/euclidean_resection.cc
-	libmv/multiview/fundamental.cc
-	libmv/multiview/homography.cc
-	libmv/multiview/panography.cc
-	libmv/multiview/projection.cc
-	libmv/multiview/triangulation.cc
-	libmv/numeric/numeric.cc
-	libmv/numeric/poly.cc
-	libmv/simple_pipeline/bundle.cc
-	libmv/simple_pipeline/camera_intrinsics.cc
-	libmv/simple_pipeline/detect.cc
-	libmv/simple_pipeline/initialize_reconstruction.cc
-	libmv/simple_pipeline/intersect.cc
-	libmv/simple_pipeline/keyframe_selection.cc
-	libmv/simple_pipeline/modal_solver.cc
-	libmv/simple_pipeline/pipeline.cc
-	libmv/simple_pipeline/reconstruction.cc
-	libmv/simple_pipeline/reconstruction_scale.cc
-	libmv/simple_pipeline/resect.cc
-	libmv/simple_pipeline/tracks.cc
-	libmv/tracking/brute_region_tracker.cc
-	libmv/tracking/esm_region_tracker.cc
-	libmv/tracking/hybrid_region_tracker.cc
-	libmv/tracking/klt_region_tracker.cc
-	libmv/tracking/lmicklt_region_tracker.cc
-	libmv/tracking/pyramid_region_tracker.cc
-	libmv/tracking/retrack_region_tracker.cc
-	libmv/tracking/track_region.cc
-	libmv/tracking/trklt_region_tracker.cc
+if(WITH_LIBMV)
+	add_definitions(
+		-DWITH_LIBMV
+	)
 
-	third_party/fast/fast_10.c
-	third_party/fast/fast_11.c
-	third_party/fast/fast_12.c
-	third_party/fast/fast_9.c
-	third_party/fast/fast.c
-	third_party/fast/nonmax.c
-	third_party/gflags/gflags.cc
-	third_party/gflags/gflags_completions.cc
-	third_party/gflags/gflags_reporting.cc
+	list(APPEND INC
+		third_party/ceres/include
+	)
 
-	libmv-capi.h
-	libmv/base/id_generator.h
-	libmv/base/scoped_ptr.h
-	libmv/base/vector.h
-	libmv/base/vector_utils.h
-	libmv/image/array_nd.h
-	libmv/image/convolve.h
-	libmv/image/correlation.h
-	libmv/image/image.h
-	libmv/image/sample.h
-	libmv/image/tuple.h
-	libmv/logging/logging.h
-	libmv/multiview/conditioning.h
-	libmv/multiview/euclidean_resection.h
-	libmv/multiview/fundamental.h
-	libmv/multiview/homography.h
-	libmv/multiview/homography_parameterization.h
-	libmv/multiview/nviewtriangulation.h
-	libmv/multiview/panography.h
-	libmv/multiview/projection.h
-	libmv/multiview/resection.h
-	libmv/multiview/triangulation.h
-	libmv/numeric/dogleg.h
-	libmv/numeric/function_derivative.h
-	libmv/numeric/levenberg_marquardt.h
-	libmv/numeric/numeric.h
-	libmv/numeric/poly.h
-	libmv/simple_pipeline/bundle.h
-	libmv/simple_pipeline/callbacks.h
-	libmv/simple_pipeline/camera_intrinsics.h
-	libmv/simple_pipeline/detect.h
-	libmv/simple_pipeline/initialize_reconstruction.h
-	libmv/simple_pipeline/intersect.h
-	libmv/simple_pipeline/keyframe_selection.h
-	libmv/simple_pipeline/modal_solver.h
-	libmv/simple_pipeline/pipeline.h
-	libmv/simple_pipeline/reconstruction.h
-	libmv/simple_pipeline/reconstruction_scale.h
-	libmv/simple_pipeline/resect.h
-	libmv/simple_pipeline/tracks.h
-	libmv/tracking/brute_region_tracker.h
-	libmv/tracking/esm_region_tracker.h
-	libmv/tracking/hybrid_region_tracker.h
-	libmv/tracking/klt_region_tracker.h
-	libmv/tracking/lmicklt_region_tracker.h
-	libmv/tracking/pyramid_region_tracker.h
-	libmv/tracking/region_tracker.h
-	libmv/tracking/retrack_region_tracker.h
-	libmv/tracking/track_region.h
-	libmv/tracking/trklt_region_tracker.h
+	set(INC_SYS
+		../Eigen3
+		${PNG_INCLUDE_DIR}
+		${ZLIB_INCLUDE_DIRS}
+	)
 
-	third_party/fast/fast.h
-	third_party/gflags/config.h
-	third_party/gflags/gflags/gflags_completions.h
-	third_party/gflags/gflags/gflags_declare.h
-	third_party/gflags/gflags/gflags.h
-	third_party/gflags/mutex.h
-	third_party/gflags/util.h
-	third_party/msinttypes/inttypes.h
-	third_party/msinttypes/stdint.h
-)
-
-if(WIN32)
 	list(APPEND SRC
-		third_party/glog/src/logging.cc
-		third_party/glog/src/raw_logging.cc
-		third_party/glog/src/utilities.cc
-		third_party/glog/src/vlog_is_on.cc
-		third_party/glog/src/windows/port.cc
+		libmv-capi.cc
+		libmv/image/array_nd.cc
+		libmv/image/convolve.cc
+		libmv/multiview/conditioning.cc
+		libmv/multiview/euclidean_resection.cc
+		libmv/multiview/fundamental.cc
+		libmv/multiview/homography.cc
+		libmv/multiview/panography.cc
+		libmv/multiview/projection.cc
+		libmv/multiview/triangulation.cc
+		libmv/numeric/numeric.cc
+		libmv/numeric/poly.cc
+		libmv/simple_pipeline/bundle.cc
+		libmv/simple_pipeline/camera_intrinsics.cc
+		libmv/simple_pipeline/detect.cc
+		libmv/simple_pipeline/initialize_reconstruction.cc
+		libmv/simple_pipeline/intersect.cc
+		libmv/simple_pipeline/keyframe_selection.cc
+		libmv/simple_pipeline/modal_solver.cc
+		libmv/simple_pipeline/pipeline.cc
+		libmv/simple_pipeline/reconstruction.cc
+		libmv/simple_pipeline/reconstruction_scale.cc
+		libmv/simple_pipeline/resect.cc
+		libmv/simple_pipeline/tracks.cc
+		libmv/tracking/brute_region_tracker.cc
+		libmv/tracking/esm_region_tracker.cc
+		libmv/tracking/hybrid_region_tracker.cc
+		libmv/tracking/klt_region_tracker.cc
+		libmv/tracking/lmicklt_region_tracker.cc
+		libmv/tracking/pyramid_region_tracker.cc
+		libmv/tracking/retrack_region_tracker.cc
+		libmv/tracking/track_region.cc
+		libmv/tracking/trklt_region_tracker.cc
 
-		third_party/glog/src/utilities.h
-		third_party/glog/src/stacktrace_generic-inl.h
-		third_party/glog/src/stacktrace.h
-		third_party/glog/src/stacktrace_x86_64-inl.h
-		third_party/glog/src/base/googleinit.h
-		third_party/glog/src/base/mutex.h
-		third_party/glog/src/base/commandlineflags.h
-		third_party/glog/src/stacktrace_powerpc-inl.h
-		third_party/glog/src/stacktrace_x86-inl.h
-		third_party/glog/src/config.h
-		third_party/glog/src/stacktrace_libunwind-inl.h
-		third_party/glog/src/windows/glog/raw_logging.h
-		third_party/glog/src/windows/glog/vlog_is_on.h
-		third_party/glog/src/windows/glog/logging.h
-		third_party/glog/src/windows/glog/log_severity.h
-		third_party/glog/src/windows/port.h
-		third_party/glog/src/windows/config.h
-	)
+		third_party/fast/fast_10.c
+		third_party/fast/fast_11.c
+		third_party/fast/fast_12.c
+		third_party/fast/fast_9.c
+		third_party/fast/fast.c
+		third_party/fast/nonmax.c
+		third_party/gflags/gflags.cc
+		third_party/gflags/gflags_completions.cc
+		third_party/gflags/gflags_reporting.cc
 
-	list(APPEND INC
-		third_party/glog/src/windows
+		libmv/base/id_generator.h
+		libmv/base/scoped_ptr.h
+		libmv/base/vector.h
+		libmv/base/vector_utils.h
+		libmv/image/array_nd.h
+		libmv/image/convolve.h
+		libmv/image/correlation.h
+		libmv/image/image.h
+		libmv/image/sample.h
+		libmv/image/tuple.h
+		libmv/logging/logging.h
+		libmv/multiview/conditioning.h
+		libmv/multiview/euclidean_resection.h
+		libmv/multiview/fundamental.h
+		libmv/multiview/homography.h
+		libmv/multiview/homography_parameterization.h
+		libmv/multiview/nviewtriangulation.h
+		libmv/multiview/panography.h
+		libmv/multiview/projection.h
+		libmv/multiview/resection.h
+		libmv/multiview/triangulation.h
+		libmv/numeric/dogleg.h
+		libmv/numeric/function_derivative.h
+		libmv/numeric/levenberg_marquardt.h
+		libmv/numeric/numeric.h
+		libmv/numeric/poly.h
+		libmv/simple_pipeline/bundle.h
+		libmv/simple_pipeline/callbacks.h
+		libmv/simple_pipeline/camera_intrinsics.h
+		libmv/simple_pipeline/detect.h
+		libmv/simple_pipeline/initialize_reconstruction.h
+		libmv/simple_pipeline/intersect.h
+		libmv/simple_pipeline/keyframe_selection.h
+		libmv/simple_pipeline/modal_solver.h
+		libmv/simple_pipeline/pipeline.h
+		libmv/simple_pipeline/reconstruction.h
+		libmv/simple_pipeline/reconstruction_scale.h
+		libmv/simple_pipeline/resect.h
+		libmv/simple_pipeline/tracks.h
+		libmv/tracking/brute_region_tracker.h
+		libmv/tracking/esm_region_tracker.h
+		libmv/tracking/hybrid_region_tracker.h
+		libmv/tracking/klt_region_tracker.h
+		libmv/tracking/lmicklt_region_tracker.h

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list