[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38207] branches/soc-2011-salad: Merging r38040 through r38205 from soc-2011-tomato into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Thu Jul 7 22:49:50 CEST 2011
Revision: 38207
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38207
Author: nazgul
Date: 2011-07-07 20:49:49 +0000 (Thu, 07 Jul 2011)
Log Message:
-----------
Merging r38040 through r38205 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38040
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38205
Modified Paths:
--------------
branches/soc-2011-salad/build_files/scons/tools/Blender.py
branches/soc-2011-salad/extern/CMakeLists.txt
branches/soc-2011-salad/extern/SConscript
branches/soc-2011-salad/extern/libmv/CMakeLists.txt
branches/soc-2011-salad/extern/libmv/SConscript
branches/soc-2011-salad/extern/libmv/bundle.sh
branches/soc-2011-salad/extern/libmv/files.txt
branches/soc-2011-salad/extern/libmv/libmv/base/vector.h
branches/soc-2011-salad/extern/libmv/libmv/image/image.h
branches/soc-2011-salad/extern/libmv/libmv/logging/logging.h
branches/soc-2011-salad/extern/libmv/libmv/numeric/levenberg_marquardt.h
branches/soc-2011-salad/extern/libmv/libmv-capi.cpp
branches/soc-2011-salad/extern/libmv/libmv-capi.h
branches/soc-2011-salad/extern/libmv/mkfiles.sh
branches/soc-2011-salad/intern/opennl/CMakeLists.txt
branches/soc-2011-salad/intern/opennl/SConscript
branches/soc-2011-salad/intern/opennl/superlu/get_perm_c.c
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-salad/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-salad/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-salad/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/blenloader/intern/writefile.c
branches/soc-2011-salad/source/blender/editors/include/UI_resources.h
branches/soc-2011-salad/source/blender/editors/interface/resources.c
branches/soc-2011-salad/source/blender/editors/object/object_constraint.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-salad/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-salad/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-salad/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/creator/CMakeLists.txt
branches/soc-2011-salad/source/creator/creator.c
Added Paths:
-----------
branches/soc-2011-salad/extern/colamd/
branches/soc-2011-salad/extern/colamd/CMakeLists.txt
branches/soc-2011-salad/extern/colamd/Doc/
branches/soc-2011-salad/extern/colamd/Doc/ChangeLog
branches/soc-2011-salad/extern/colamd/Doc/lesser.txt
branches/soc-2011-salad/extern/colamd/Include/
branches/soc-2011-salad/extern/colamd/Include/UFconfig.h
branches/soc-2011-salad/extern/colamd/Include/colamd.h
branches/soc-2011-salad/extern/colamd/README.txt
branches/soc-2011-salad/extern/colamd/SConscript
branches/soc-2011-salad/extern/colamd/Source/
branches/soc-2011-salad/extern/colamd/Source/colamd.c
branches/soc-2011-salad/extern/colamd/Source/colamd_global.c
branches/soc-2011-salad/extern/libmv/ChangeLog
branches/soc-2011-salad/extern/libmv/libmv/multiview/
branches/soc-2011-salad/extern/libmv/libmv/multiview/conditioning.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/conditioning.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/euclidean_resection.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/nviewtriangulation.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/projection.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/projection.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/resection.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/triangulation.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/triangulation.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/bundle.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/intersect.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/reconstruction.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/resect.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/resect.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/tracks.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/tracks.h
branches/soc-2011-salad/extern/libmv/patches/
branches/soc-2011-salad/extern/libmv/patches/series
branches/soc-2011-salad/extern/libmv/third_party/
branches/soc-2011-salad/extern/libmv/third_party/gflags/
branches/soc-2011-salad/extern/libmv/third_party/gflags/README.libmv
branches/soc-2011-salad/extern/libmv/third_party/gflags/config.h
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags.cc
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags.h
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags_completions.cc
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags_completions.h
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags_reporting.cc
branches/soc-2011-salad/extern/libmv/third_party/gflags/mutex.h
branches/soc-2011-salad/extern/libmv/third_party/glog/
branches/soc-2011-salad/extern/libmv/third_party/glog/AUTHORS
branches/soc-2011-salad/extern/libmv/third_party/glog/COPYING
branches/soc-2011-salad/extern/libmv/third_party/glog/ChangeLog
branches/soc-2011-salad/extern/libmv/third_party/glog/NEWS
branches/soc-2011-salad/extern/libmv/third_party/glog/README
branches/soc-2011-salad/extern/libmv/third_party/glog/README.libmv
branches/soc-2011-salad/extern/libmv/third_party/glog/src/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/base/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/base/commandlineflags.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/base/googleinit.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/base/mutex.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/config.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/config_linux.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/config_mac.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/demangle.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/demangle.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/log_severity.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/logging.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/raw_logging.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/logging.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/raw_logging.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/signalhandler.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/symbolize.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/symbolize.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/utilities.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/utilities.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/vlog_is_on.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/config.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/logging.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/port.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/port.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/preprocess.sh
branches/soc-2011-salad/extern/libmv/third_party/ldl/
branches/soc-2011-salad/extern/libmv/third_party/ldl/CMakeLists.txt
branches/soc-2011-salad/extern/libmv/third_party/ldl/Doc/
branches/soc-2011-salad/extern/libmv/third_party/ldl/Doc/ChangeLog
branches/soc-2011-salad/extern/libmv/third_party/ldl/Doc/lesser.txt
branches/soc-2011-salad/extern/libmv/third_party/ldl/Include/
branches/soc-2011-salad/extern/libmv/third_party/ldl/Include/ldl.h
branches/soc-2011-salad/extern/libmv/third_party/ldl/README.libmv
branches/soc-2011-salad/extern/libmv/third_party/ldl/README.txt
branches/soc-2011-salad/extern/libmv/third_party/ldl/Source/
branches/soc-2011-salad/extern/libmv/third_party/ldl/Source/ldl.c
branches/soc-2011-salad/extern/libmv/third_party/msinttypes/
branches/soc-2011-salad/extern/libmv/third_party/msinttypes/README.libmv
branches/soc-2011-salad/extern/libmv/third_party/msinttypes/inttypes.h
branches/soc-2011-salad/extern/libmv/third_party/msinttypes/stdint.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/
branches/soc-2011-salad/extern/libmv/third_party/ssba/COPYING.TXT
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_linear.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_optimization.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/README.TXT
branches/soc-2011-salad/extern/libmv/third_party/ssba/README.libmv
Removed Paths:
-------------
branches/soc-2011-salad/extern/colamd/CMakeLists.txt
branches/soc-2011-salad/extern/colamd/Doc/
branches/soc-2011-salad/extern/colamd/Doc/ChangeLog
branches/soc-2011-salad/extern/colamd/Doc/lesser.txt
branches/soc-2011-salad/extern/colamd/Include/
branches/soc-2011-salad/extern/colamd/Include/UFconfig.h
branches/soc-2011-salad/extern/colamd/Include/colamd.h
branches/soc-2011-salad/extern/colamd/README.txt
branches/soc-2011-salad/extern/colamd/SConscript
branches/soc-2011-salad/extern/colamd/Source/
branches/soc-2011-salad/extern/colamd/Source/colamd.c
branches/soc-2011-salad/extern/colamd/Source/colamd_global.c
branches/soc-2011-salad/extern/libmv/libmv/multiview/conditioning.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/conditioning.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/euclidean_resection.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/nviewtriangulation.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/projection.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/projection.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/resection.h
branches/soc-2011-salad/extern/libmv/libmv/multiview/triangulation.cc
branches/soc-2011-salad/extern/libmv/libmv/multiview/triangulation.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/bundle.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/intersect.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/reconstruction.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/resect.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/resect.h
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/tracks.cc
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/tracks.h
branches/soc-2011-salad/extern/libmv/patches/series
branches/soc-2011-salad/extern/libmv/third_party/gflags/
branches/soc-2011-salad/extern/libmv/third_party/gflags/README.libmv
branches/soc-2011-salad/extern/libmv/third_party/gflags/config.h
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags.cc
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags.h
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags_completions.cc
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags_completions.h
branches/soc-2011-salad/extern/libmv/third_party/gflags/gflags_reporting.cc
branches/soc-2011-salad/extern/libmv/third_party/gflags/mutex.h
branches/soc-2011-salad/extern/libmv/third_party/glog/
branches/soc-2011-salad/extern/libmv/third_party/glog/AUTHORS
branches/soc-2011-salad/extern/libmv/third_party/glog/COPYING
branches/soc-2011-salad/extern/libmv/third_party/glog/ChangeLog
branches/soc-2011-salad/extern/libmv/third_party/glog/NEWS
branches/soc-2011-salad/extern/libmv/third_party/glog/README
branches/soc-2011-salad/extern/libmv/third_party/glog/README.libmv
branches/soc-2011-salad/extern/libmv/third_party/glog/src/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/base/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/base/commandlineflags.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/base/googleinit.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/base/mutex.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/config.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/config_linux.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/config_mac.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/demangle.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/demangle.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/log_severity.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/logging.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/raw_logging.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/logging.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/raw_logging.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/signalhandler.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/symbolize.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/symbolize.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/utilities.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/utilities.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/vlog_is_on.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/config.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/logging.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/port.cc
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/port.h
branches/soc-2011-salad/extern/libmv/third_party/glog/src/windows/preprocess.sh
branches/soc-2011-salad/extern/libmv/third_party/ldl/
branches/soc-2011-salad/extern/libmv/third_party/ldl/CMakeLists.txt
branches/soc-2011-salad/extern/libmv/third_party/ldl/Doc/
branches/soc-2011-salad/extern/libmv/third_party/ldl/Doc/ChangeLog
branches/soc-2011-salad/extern/libmv/third_party/ldl/Doc/lesser.txt
branches/soc-2011-salad/extern/libmv/third_party/ldl/Include/
branches/soc-2011-salad/extern/libmv/third_party/ldl/Include/ldl.h
branches/soc-2011-salad/extern/libmv/third_party/ldl/README.libmv
branches/soc-2011-salad/extern/libmv/third_party/ldl/README.txt
branches/soc-2011-salad/extern/libmv/third_party/ldl/Source/
branches/soc-2011-salad/extern/libmv/third_party/ldl/Source/ldl.c
branches/soc-2011-salad/extern/libmv/third_party/msinttypes/
branches/soc-2011-salad/extern/libmv/third_party/msinttypes/README.libmv
branches/soc-2011-salad/extern/libmv/third_party/msinttypes/inttypes.h
branches/soc-2011-salad/extern/libmv/third_party/msinttypes/stdint.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/
branches/soc-2011-salad/extern/libmv/third_party/ssba/COPYING.TXT
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
branches/soc-2011-salad/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_linear.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
branches/soc-2011-salad/extern/libmv/third_party/ssba/Math/v3d_optimization.h
branches/soc-2011-salad/extern/libmv/third_party/ssba/README.TXT
branches/soc-2011-salad/extern/libmv/third_party/ssba/README.libmv
branches/soc-2011-salad/intern/opennl/superlu/colamd.c
branches/soc-2011-salad/intern/opennl/superlu/colamd.h
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-38195
/branches/soc-2011-tomato:36831-38039
/trunk/blender:36834-38193
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-38195
/branches/soc-2011-tomato:36831-38205
/trunk/blender:36834-38196
Modified: branches/soc-2011-salad/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/tools/Blender.py 2011-07-07 20:46:35 UTC (rev 38206)
+++ branches/soc-2011-salad/build_files/scons/tools/Blender.py 2011-07-07 20:49:49 UTC (rev 38207)
@@ -315,6 +315,10 @@
if not env['WITH_BF_SDL']:
defs.append('DISABLE_SDL')
+ if env['WITH_BF_LIBMV']:
+ incs.append('#/extern/libmv')
+ defs.append('WITH_LIBMV')
+
if env['WITH_BF_PYTHON']:
incs.append('#/source/blender/python')
defs.append('WITH_PYTHON')
Modified: branches/soc-2011-salad/extern/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/extern/CMakeLists.txt 2011-07-07 20:46:35 UTC (rev 38206)
+++ branches/soc-2011-salad/extern/CMakeLists.txt 2011-07-07 20:49:49 UTC (rev 38207)
@@ -27,6 +27,8 @@
# Otherwise we get warnings here that we cant fix in external projects
remove_strict_flags()
+add_subdirectory(colamd)
+
if(WITH_BULLET)
add_subdirectory(bullet2)
endif()
Modified: branches/soc-2011-salad/extern/SConscript
===================================================================
--- branches/soc-2011-salad/extern/SConscript 2011-07-07 20:46:35 UTC (rev 38206)
+++ branches/soc-2011-salad/extern/SConscript 2011-07-07 20:49:49 UTC (rev 38207)
@@ -3,6 +3,7 @@
Import('env')
SConscript(['glew/SConscript'])
+SConscript(['colamd/SConscript'])
if env['WITH_BF_ELTOPO']:
SConscript(['eltopo/SConscript'])
Deleted: branches/soc-2011-salad/extern/colamd/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/colamd/CMakeLists.txt 2011-07-07 19:35:55 UTC (rev 38205)
+++ branches/soc-2011-salad/extern/colamd/CMakeLists.txt 2011-07-07 20:49:49 UTC (rev 38207)
@@ -1,41 +0,0 @@
-# $Id$
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2011, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Blender Foundation,
-# Sergey Sharybin
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
- ./Include
-)
-
-set(INC_SYS
-
-)
-
-set(SRC
- Source/colamd.c
- Source/colamd_global.c
-
- Include//colamd.h
-)
-
-blender_add_lib(extern_colamd "${SRC}" "${INC}" "${INC_SYS}")
Copied: branches/soc-2011-salad/extern/colamd/CMakeLists.txt (from rev 38205, branches/soc-2011-tomato/extern/colamd/CMakeLists.txt)
===================================================================
--- branches/soc-2011-salad/extern/colamd/CMakeLists.txt (rev 0)
+++ branches/soc-2011-salad/extern/colamd/CMakeLists.txt 2011-07-07 20:49:49 UTC (rev 38207)
@@ -0,0 +1,41 @@
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2011, Blender Foundation
+# All rights reserved.
+#
+# Contributor(s): Blender Foundation,
+# Sergey Sharybin
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+ ./Include
+)
+
+set(INC_SYS
+
+)
+
+set(SRC
+ Source/colamd.c
+ Source/colamd_global.c
+
+ Include//colamd.h
+)
+
+blender_add_lib(extern_colamd "${SRC}" "${INC}" "${INC_SYS}")
Deleted: branches/soc-2011-salad/extern/colamd/Doc/ChangeLog
===================================================================
--- branches/soc-2011-tomato/extern/colamd/Doc/ChangeLog 2011-07-07 19:35:55 UTC (rev 38205)
+++ branches/soc-2011-salad/extern/colamd/Doc/ChangeLog 2011-07-07 20:49:49 UTC (rev 38207)
@@ -1,129 +0,0 @@
-May 31, 2007: version 2.7.0
-
- * ported to 64-bit MATLAB
-
- * subdirectories added (Source/, Include/, Lib/, Doc/, MATLAB/, Demo/)
-
-Dec 12, 2006, version 2.5.2
-
- * minor MATLAB cleanup. MATLAB functions renamed colamd2 and symamd2,
- so that they do not conflict with the built-in versions. Note that
- the MATLAB built-in functions colamd and symamd are identical to
- the colamd and symamd functions here.
-
-Aug 31, 2006: Version 2.5.1
-
- * minor change to colamd.m and symamd.m, to use etree instead
- of sparsfun.
-
-Apr. 30, 2006: Version 2.5
-
- * colamd_recommended modified, to do more careful integer overflow
- checking. It now returns size_t, not int. colamd_l_recommended
- also returns size_t. A zero is returned if an error occurs. A
- postive return value denotes success. In v2.4 and earlier,
- -1 was returned on error (an int or long).
-
- * long replaced with UF_long integer, which is long except on WIN64.
-
-Nov 15, 2005:
-
- * minor editting of comments; version number (2.4) unchanged.
-
-Changes from Version 2.3 to 2.4 (Aug 30, 2005)
-
- * Makefile now relies on ../UFconfig/UFconfig.mk
-
- * changed the dense row/col detection. The meaning of the knobs
- has thus changed.
-
- * added an option to turn off aggressive absorption. It was
- always on in versions 2.3 and earlier.
-
- * added a #define'd version number
-
- * added a function pointer (colamd_printf) for COLAMD's printing.
-
- * added a -DNPRINT option, to turn off printing at compile-time.
-
- * added a check for integer overflow in colamd_recommended
-
- * minor changes to allow for more simpler 100% test coverage
-
- * bug fix. If symamd v2.3 fails to allocate its copy of the input
- matrix, then it erroneously frees a calloc'd workspace twice.
- This bug has no effect on the MATLAB symamd mexFunction, since
- mxCalloc terminates the mexFunction if it fails to allocate
- memory. Similarly, UMFPACK is not affected because it does not
- use symamd. The bug has no effect on the colamd ordering
- routine in v2.3.
-
-Changes from Version 2.2 to 2.3 (Sept. 8, 2003)
-
- * removed the call to the MATLAB spparms ('spumoni') function.
- This can take a lot of time if you are ordering many small
- matrices. Only affects the MATLAB interface (colamdmex.c,
- symamdmex.c, colamdtestmex.c, and symamdtestmex.c). The
- usage of the optional 2nd argument to the colamd and symamd
- mexFunctions was changed accordingly.
-
-Changes from Version 2.1 to 2.2 (Sept. 23, 2002)
-
- * extensive testing routines added (colamd_test.m, colamdtestmex.c,
- and symamdtestmex.c), and the Makefile modified accordingly.
-
- * a few typos in the comments corrected
-
- * use of the MATLAB "flops" command removed from colamd_demo, and an
- m-file routine luflops.m added.
-
- * an explicit typecast from unsigned to int added, for COLAMD_C and
- COLAMD_R in colamd.h.
-
- * #include <stdio.h> added to colamd_example.c
-
-
-Changes from Version 2.0 to 2.1 (May 4, 2001)
-
- * TRUE and FALSE are predefined on some systems, so they are defined
- here only if not already defined.
-
- * web site changed
-
- * UNIX Makefile modified, to handle the case if "." is not in your path.
-
-
-Changes from Version 1.0 to 2.0 (January 31, 2000)
-
- No bugs were found in version 1.1. These changes merely add new
- functionality.
-
- * added the COLAMD_RECOMMENDED (nnz, n_row, n_col) macro.
-
- * moved the output statistics, from A, to a separate output argument.
- The arguments changed for the C-callable routines.
-
- * added colamd_report and symamd_report.
-
- * added a C-callable symamd routine. Formerly, symamd was only
- available as a mexFunction from MATLAB.
-
- * added error-checking to symamd. Formerly, it assumed its input
- was error-free.
-
- * added the optional stats and knobs arguments to the symamd mexFunction
-
- * deleted colamd_help. A help message is still available from
- "help colamd" and "help symamd" in MATLAB.
-
- * deleted colamdtree.m and symamdtree.m. Now, colamd.m and symamd.m
- also do the elimination tree post-ordering. The Version 1.1
- colamd and symamd mexFunctions, which do not do the post-
- ordering, are now visible as colamdmex and symamdmex from
- MATLAB. Essentialy, the post-ordering is now the default
- behavior of colamd.m and symamd.m, to match the behavior of
- colmmd and symmmd. The post-ordering is only available in the
- MATLAB interface, not the C-callable interface.
-
- * made a slight change to the dense row/column detection in symamd,
- to match the stated specifications.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list