[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55814] branches/soc-2008-mxcurioni: svn merge ^/trunk/blender -r55776:55813

Campbell Barton ideasman42 at gmail.com
Fri Apr 5 17:42:32 CEST 2013 

Revision: 55814
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55814
Author:   campbellbarton
Date:     2013-04-05 15:42:31 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
svn merge ^/trunk/blender -r55776:55813

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst
    branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/libmv/ChangeLog
    branches/soc-2008-mxcurioni/extern/libmv/files.txt
    branches/soc-2008-mxcurioni/extern/libmv/libmv/base/vector.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/base/vector_utils.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/array_nd.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/array_nd.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/convolve.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/convolve.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/correlation.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/image.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/sample.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/tuple.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/conditioning.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/conditioning.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/euclidean_resection.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/fundamental.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/homography.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/homography.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/homography_parameterization.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/nviewtriangulation.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/panography.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/projection.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/projection.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/resection.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/triangulation.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/triangulation.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/dogleg.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/function_derivative.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/levenberg_marquardt.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/numeric.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/numeric.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/poly.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/poly.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/bundle.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/callbacks.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/detect.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/detect.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/intersect.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/intersect.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/modal_solver.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/modal_solver.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/reconstruction.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/tracks.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/brute_region_tracker.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/esm_region_tracker.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/hybrid_region_tracker.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/klt_region_tracker.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/lmicklt_region_tracker.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/retrack_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/track_region.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/ChangeLog
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/files.txt
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/include/ceres/jet.h
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/fast/fast_10.c
    branches/soc-2008-mxcurioni/extern/libmv/third_party/fast/fast_11.c
    branches/soc-2008-mxcurioni/extern/libmv/third_party/fast/fast_12.c
    branches/soc-2008-mxcurioni/extern/libmv/third_party/fast/fast_9.c
    branches/soc-2008-mxcurioni/extern/libmv/third_party/gflags/gflags_completions.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/logging.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/utilities.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/vlog_is_on.cc
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
    branches/soc-2008-mxcurioni/intern/cycles/render/osl.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/osl.h
    branches/soc-2008-mxcurioni/intern/opencolorio/ocio_impl_glsl.cc
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/node.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/text/readme.html
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_displist.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixHueOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ZCombineOperation.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_glutil.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_keymap.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/Texture.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/Texture.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoBase.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/panography.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/blas.h

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/callbacks.cc

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55776
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55813

Modified: branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh	2013-04-05 15:09:25 UTC (rev 55813)
+++ branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh	2013-04-05 15:42:31 UTC (rev 55814)
@@ -1207,7 +1207,7 @@
 }
 
 check_package_DEB() {
-  r=`apt-cache policy $1 | grep -c 'Candidate:'`
+  r=`apt-cache show $1 | grep -c 'Package:'`
 
   if [ $r -ge 1 ]; then
     return 0
@@ -1298,18 +1298,38 @@
   THEORA_USE=true
 
   # Install newest libtiff-dev in debian/ubuntu.
-  TIFF="libtiff5"
+  TIFF="libtiff"
   check_package_DEB $TIFF
   if [ $? -eq 0 ]; then
     _packages="$_packages $TIFF-dev"
   else
-    TIFF="libtiff"
+    TIFF="libtiff5"
     check_package_DEB $TIFF
     if [ $? -eq 0 ]; then
       _packages="$_packages $TIFF-dev"
+    else
+      TIFF="libtiff4"  # Some old distro, like e.g. ubuntu 10.04 :/
+      check_package_DEB $TIFF
+      if [ $? -eq 0 ]; then
+        _packages="$_packages $TIFF-dev"
+      fi
     fi
   fi
 
+  GIT="git"
+  check_package_DEB $GIT
+  if [ $? -eq 0 ]; then
+    INFO $GIT
+    _packages="$_packages $GIT"
+  else
+    GIT="git-core"  # Some old distro, like e.g. ubuntu 10.04 :/
+    check_package_DEB $GIT
+    if [ $? -eq 0 ]; then
+      INFO $GIT
+      _packages="$_packages $GIT"
+    fi
+  fi
+
   if $WITH_ALL; then
     _packages="$_packages libspnav-dev libjack-dev"
   fi
@@ -1471,7 +1491,7 @@
     else
       if $have_llvm; then
         INFO ""
-        install_packages_DEB flex bison libtbb-dev git
+        install_packages_DEB flex bison libtbb-dev
         # No package currently!
         INFO ""
         compile_OSL
@@ -1484,7 +1504,7 @@
       INFO "WARNING! Skipping OpenCOLLADA installation, as requested..."
     else
       INFO ""
-      install_packages_DEB git libpcre3-dev libxml2-dev
+      install_packages_DEB libpcre3-dev libxml2-dev
       # Find path to libxml shared lib...
       _XML2_LIB=`dpkg -L libxml2-dev | grep -e ".*/libxml2.so"`
       # No package

Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst	2013-04-05 15:09:25 UTC (rev 55813)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst	2013-04-05 15:42:31 UTC (rev 55814)
@@ -97,7 +97,7 @@
    The standalone player saves .png files. It does not support color space conversion 
    or gamma correction.
    
-   When run from Blender, makeScreenshot supports Iris, IrisZ, TGA, Raw TGA, PNG, HamX, and Jpeg.
+   When run from Blender, makeScreenshot supports all Blender image file formats like PNG, TGA, Jpeg and OpenEXR.
    Gamma, Colorspace conversion and Jpeg compression are taken from the Render settings panels.
    
    :type filename: string

Modified: branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt	2013-04-05 15:09:25 UTC (rev 55813)
+++ branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt	2013-04-05 15:42:31 UTC (rev 55814)
@@ -45,12 +45,12 @@
 	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/callbacks.cc
 	libmv/simple_pipeline/camera_intrinsics.cc
 	libmv/simple_pipeline/detect.cc
 	libmv/simple_pipeline/initialize_reconstruction.cc

Modified: branches/soc-2008-mxcurioni/extern/libmv/ChangeLog
===================================================================
--- branches/soc-2008-mxcurioni/extern/libmv/ChangeLog	2013-04-05 15:09:25 UTC (rev 55813)
+++ branches/soc-2008-mxcurioni/extern/libmv/ChangeLog	2013-04-05 15:42:31 UTC (rev 55814)
@@ -1,3 +1,169 @@
+commit e3b2bccba6145290738a6677c14f7369ec7a38cd
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Thu Apr 4 02:59:58 2013 +0600
+
+    Suppress strict compiler warnings in glags/glog libraries
+
+commit 5fca459adcf0a3419fa9cd8d983dc2c952d02647
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Thu Apr 4 01:20:18 2013 +0600
+
+    Lint cleanup, mostly white space and line width.
+    
+    Also moved own includes to the top of files.
+    
+    Should be no functional changes :)
+
+commit 9a9dd458a622928b91dbd3c79900577923283838
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Mar 29 00:20:29 2013 +0600
+
+    Fix for TransformTracks in uncalibrated pipeline
+    
+    Transformation matrix was completely ignored by
+    TransformTracks() and final marker coordinate
+    exactly matched it's source coordinates.
+    
+    Seems to be just a typo in vector usage: need to
+    use "b" (which is transformed one) instead of "a"
+    when converting projective coordinate to 2D space.
+
+commit d35766cc9901609e32f4d80faba715695bea3c40
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Mar 29 00:19:11 2013 +0600
+
+    Revert part of e2eb58c4230f94ef0c72fb4005e5434088d52e80
+    
+    That commit included one change which shall have been
+    go as separate commit with more detailed description.
+
+commit e8d71b4e96fd78eb60773b6557d66da672e65753
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 20:37:05 2013 +0600
+
+    Silenced more warnings
+    
+    - Added includes of own header to fast implementation files.
+    
+    - Camera intrinsics wouldn't complain about unknown pragma when
+      building without OpenMP support.
+    
+    TODO: Make it a CMake option to build libmv with OpenMP support.
+    	  Currently multi-threaded intrinsics only available when
+          using custom CMake rules for bundled libmv version
+          (as it's done in Blender).
+
+commit ad442812654f270dc088394410fda1b81b8dc450
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 20:18:51 2013 +0600
+
+    Multithreaded camera intrinsics
+    
+    Implemented multithreaded buffer (un)distortion
+    for camera intrinsics using OpenMP.
+    
+    By default, (un)distortion is single-threaded,
+    but it is possible to as CameraIntrinsics to
+    use more threads by calling SetThreads method.
+
+commit c88b4881096174a16a9f9e6fc2c9dcad3e255b25
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 18:45:09 2013 +0600
+
+    Movie functions implementation from panography header
+    into own CC implementation file.
+    
+    Before this all panography functions were declared as
+    static, which is not so much useful from re-useability
+    point of view.
+
+commit 2d2faf9104bc035722cff6775e1b8e7c93143aba
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 18:37:36 2013 +0600
+
+    Build shared Ceres library only if BUILD_SHARED_LIBS is enabled
+
+commit daa3ddd3260ccaf2bf9c72eadb89213d91e549ec
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 18:21:52 2013 +0600
+
+    Update Ceres to upstream version 1.5.0
+
+commit cf5dc678878345ea3f221ce50cb2b9e539c2ab38
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 15:06:24 2013 +0600
+
+    Code cleanup: removed more deprecated FFmpeg API usage
+    
+    This time in qt-tracker application.
+
+commit e2eb58c4230f94ef0c72fb4005e5434088d52e80
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 17:19:51 2013 +0600
+
+    Code cleanup: silent unused variables warnings
+
+commit af89bb24667e39b7e655173ea807fdcfbeef4422
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 16:54:14 2013 +0600
+
+    Code cleanup: no need to declare empty body for ProgressUpdateCallback:invoke
+    
+    Make force this method to be overridden by derivative classes.
+    Also removed currently unneeded callbacks.cc.
+
+commit 0441d4ee06fad0219256a5704f931eec916a3868
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 16:37:27 2013 +0600
+
+    Code cleanup: silent type narrowing in qt-tracker
+
+commit cd4b61c976448d0fdedefb3ed4b21d70e078f94b
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 16:26:39 2013 +0600
+
+    Changes to unit testing
+    
+    - Move ceres test binaries to ${LIBMV_TESTS_OUTPUT_DIR}/ceres,
+      so they don't mess with libmv's application binaries and
+      tests.
+    
+    - Removed ceres_ prefix from ceres unit tests, only use this
+      prefix for targets (targets need to be unique name).
+    
+    - Added unit tests data for ceres, otherwise system_test fails.
+    

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list