[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54847] branches/soc-2011-tomato: Merging r54751 through r54845 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Mon Feb 25 11:11:23 CET 2013


Revision: 54847
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54847
Author:   nazgul
Date:     2013-02-25 10:11:22 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
Merging r54751 through r54845 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
    branches/soc-2011-tomato/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp
    branches/soc-2011-tomato/extern/libmv/libmv-capi.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/ChangeLog
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/bundle.sh
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/files.txt
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/ceres.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/crs_matrix.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/fpclassify.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/macros.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/problem.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/rotation.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/solver.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/types.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/array_utils.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/cxsparse.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/evaluator.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/file.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/graph.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/map_util.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/mutex.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/problem.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/residual_block.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/solver.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/split.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/split.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/stl_util.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/types.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/visibility.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/patches/series
    branches/soc-2011-tomato/extern/lzo/minilzo/COPYING
    branches/soc-2011-tomato/extern/lzo/minilzo/Makefile.bak
    branches/soc-2011-tomato/extern/lzo/minilzo/README.LZO
    branches/soc-2011-tomato/extern/lzo/minilzo/lzoconf.h
    branches/soc-2011-tomato/extern/lzo/minilzo/lzodefs.h
    branches/soc-2011-tomato/extern/lzo/minilzo/minilzo.c
    branches/soc-2011-tomato/extern/lzo/minilzo/minilzo.h
    branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-tomato/intern/ghost/GHOST_IWindow.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCarbon.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2011-tomato/intern/rigidbody/RBI_api.h
    branches/soc-2011-tomato/intern/rigidbody/rb_bullet_api.cpp
    branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
    branches/soc-2011-tomato/release/scripts/modules/console/intellisense.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/rigidbody.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_timer.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/idprop.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/rigidbody.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sca.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_listbase.h
    branches/soc-2011-tomato/source/blender/blenlib/intern/listbase.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
    branches/soc-2011-tomato/source/blender/editors/curve/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/curve/SConscript
    branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-tomato/source/blender/editors/io/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/io/SConscript
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2011-tomato/source/blender/editors/object/object_add.c
    branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
    branches/soc-2011-tomato/source/blender/editors/object/object_intern.h
    branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
    branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
    branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
    branches/soc-2011-tomato/source/blender/editors/object/object_select.c
    branches/soc-2011-tomato/source/blender/editors/physics/particle_boids.c
    branches/soc-2011-tomato/source/blender/editors/physics/particle_object.c
    branches/soc-2011-tomato/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2011-tomato/source/blender/editors/screen/area.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_stats.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_group.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_modifier.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_header.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-tomato/source/blender/editors/util/ed_util.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_genfile.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_listBase.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_rigidbody_types.h
    branches/soc-2011-tomato/source/blender/makesdna/SConscript
    branches/soc-2011-tomato/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rigidbody.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_boxmask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_despeckle.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_inpaint.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_keying.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapRange.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_pixelate.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_switch.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_trackpos.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-tomato/source/creator/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Converter/KX_LibLoadStatus.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IVehicle.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/SConscript
    branches/soc-2011-tomato/source/gameengine/SConscript

Added Paths:
-----------
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/cost_function_to_functor.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/gradient_checker.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/numeric_diff_functor.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/ordered_groups.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/execution_summary.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/minimizer.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/polynomial.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/polynomial.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/preconditioner.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/wall_time.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/wall_time.h
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/languages_menu_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/rtl_utils.py
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoConvert.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoConvert.h

Removed Paths:
-------------
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/polynomial_solver.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/polynomial_solver.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.cc
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.h
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/patches/msvc_glog_fix.patch
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/patches/no_previous_declaration_fix.patch
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_languages_menu.py
    branches/soc-2011-tomato/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/KX_IpoConvert.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IGraphicController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IMotionState.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IVehicle.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/common/SConscript

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-54750
   + /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-54845

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2013-02-25 10:02:43 UTC (rev 54846)
+++ branches/soc-2011-tomato/CMakeLists.txt	2013-02-25 10:11:22 UTC (rev 54847)
@@ -124,6 +124,10 @@
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
+if (APPLE)
+	option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" OFF)
+endif()
+
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_IK_SOLVER     "Enable Legacy IK solver (only disable for development)" ON)
@@ -239,6 +243,10 @@
 if(UNIX AND NOT APPLE)
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
 	option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
+	if(WITH_STATIC_LIBS)
+		option(WITH_BOOST_ICU "Boost uses ICU library (required for linking with static Boost built with libicu)." OFF)
+		mark_as_advanced(WITH_BOOST_ICU)
+	endif()
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder"  ON)
@@ -679,7 +687,7 @@
 				list(APPEND __boost_packages locale)
 			endif()
 			find_package(Boost 1.48 COMPONENTS ${__boost_packages})
-			if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU)
+			if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
 				find_package(IcuLinux)
 			endif()
 			mark_as_advanced(Boost_DIR)  # why doesnt boost do this?
@@ -1457,11 +1465,10 @@
 	endif()
 
 	if(WITH_PYTHON)
-		if(NOT WITH_PYTHON_MODULE)
-			# we use precompiled libraries for py 3.3 and up by default
-
+		# we use precompiled libraries for py 3.3 and up by default
+		set(PYTHON_VERSION 3.3)
+		if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
 			# normally cached but not since we include them with blender
-			set(PYTHON_VERSION 3.3)
 			set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
 			# set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
 			set(PYTHON_LIBRARY python${PYTHON_VERSION}m)
@@ -1469,9 +1476,6 @@
 			# set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
 		else()
 			# module must be compiled against Python framework
-
-			# normally cached but not since we include them with blender
-			set(PYTHON_VERSION 3.3)
 			set(PYTHON_INCLUDE_DIR "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m")
 			set(PYTHON_BINARY "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}")
 			#set(PYTHON_LIBRARY python${PYTHON_VERSION})
@@ -1573,8 +1577,8 @@
 		set(WITH_INPUT_NDOF OFF)  # unsupported
 	endif()
 	
-	if(WITH_PYTHON_MODULE)
-		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/python")# force cmake to link right framework
+	if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK)
+		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")# force cmake to link right framework
 	endif()
 	
 	if(WITH_OPENCOLLADA)
@@ -2182,6 +2186,9 @@
 	info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
 	info_cfg_option(WITH_PYTHON_MODULE)
 	info_cfg_option(WITH_PYTHON_SAFETY)
+	if(APPLE)
+		info_cfg_option(WITH_PYTHON_FRAMEWORK)
+	endif()
 
 	info_cfg_text("Modifiers:")
 	info_cfg_option(WITH_MOD_BOOLEAN)

Modified: branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2011-tomato/build_files/build_environment/install_deps.sh	2013-02-25 10:02:43 UTC (rev 54846)
+++ branches/soc-2011-tomato/build_files/build_environment/install_deps.sh	2013-02-25 10:11:22 UTC (rev 54847)
@@ -188,7 +188,7 @@
 OCIO_FORCE_REBUILD=false
 OCIO_SKIP=false
 
-OIIO_VERSION="1.1.1"
+OIIO_VERSION="1.1.7"
 OIIO_SOURCE="https://github.com/OpenImageIO/oiio/tarball/Release-$OIIO_VERSION"
 OIIO_VERSION_MIN="1.1"
 OIIO_FORCE_REBUILD=false
@@ -203,8 +203,8 @@
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.2.0"
-OSL_SOURCE="https://github.com/mont29/OpenShadingLanguage/archive/blender-fixes.tar.gz"
+OSL_VERSION="1.3.0"
+OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.3.0.tar.gz"
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
 
@@ -780,27 +780,6 @@
       tar -C $SRC --transform "s,(.*/?)OpenImageIO-oiio[^/]*(.*),\1OpenImageIO-$OIIO_VERSION\2,x" \
           -xf $_src.tar.gz
 
-      cd $_src
-
-      # XXX Ugly patching hack!
-      cat << EOF | patch -p1
-diff --git a/src/libutil/SHA1.cpp b/src/libutil/SHA1.cpp
-index b9e6c8b..c761185 100644
---- a/src/libutil/SHA1.cpp
-+++ b/src/libutil/SHA1.cpp
-@@ -8,9 +8,9 @@
- 
- // If compiling with MFC, you might want to add #include "StdAfx.h"
- 
-+#include "SHA1.h"
- #include "hash.h"
- #include "dassert.h"
--#include "SHA1.h"
- 
- #ifdef SHA1_UTILITY_FUNCTIONS
- #define SHA1_MAX_FILE_BUFFER 8000
-EOF
-
       cd $CWD
 
     fi
@@ -817,6 +796,11 @@
     cmake_d="$cmake_d -D CMAKE_PREFIX_PATH=$_inst"
     cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
     cmake_d="$cmake_d -D BUILDSTATIC=ON"
+	
+    # Optional tests and cmd tools
+    cmake_d="$cmake_d -D USE_QT=OFF"
+    cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF"
+    cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF"
 
     # linking statically could give issues on Debian/Ubuntu (and probably other distros
     # which doesn't like static linking) when linking shared oiio library due to missing
@@ -1991,7 +1975,7 @@
     INFO "  $_2"
     _buildargs="$_buildargs $_1 $_2"
   elif $ALL_STATIC; then
-    _1="-D Boost_USE_ICU=ON"
+    _1="-D WITH_BOOST_ICU=ON"
     INFO "  $_1"
     _buildargs="$_buildargs $_1"
   fi
@@ -2054,6 +2038,10 @@
     INFO "BF_OIIO = '$INST/oiio'"
   fi
 
+  if [ -d $INST/osl ]; then
+    INFO "BF_OSL = '$INST/osl'"
+  fi
+
   if [ -d $INST/boost ]; then
     INFO "BF_BOOST = '$INST/boost'"
     INFO "WITH_BF_BOOST = True"

Modified: branches/soc-2011-tomato/extern/libmv/libmv/multiview/euclidean_resection.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/multiview/euclidean_resection.cc	2013-02-25 10:02:43 UTC (rev 54846)
+++ branches/soc-2011-tomato/extern/libmv/libmv/multiview/euclidean_resection.cc	2013-02-25 10:11:22 UTC (rev 54847)
@@ -653,8 +653,8 @@
   
   // Finally, with all three solutions, select the (R, t) with the best RMSE.
   VLOG(2) << "RMSE for solution 0: " << rmse(0);
-  VLOG(2) << "RMSE for solution 1: " << rmse(0);
-  VLOG(2) << "RMSE for solution 2: " << rmse(0);
+  VLOG(2) << "RMSE for solution 1: " << rmse(1);
+  VLOG(2) << "RMSE for solution 2: " << rmse(2);
   size_t n = 0;
   if (rmse(1) < rmse(0)) {
     n = 1;

Modified: branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.cc	2013-02-25 10:02:43 UTC (rev 54846)
+++ branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.cc	2013-02-25 10:11:22 UTC (rev 54847)
@@ -18,10 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-#define V3DLIB_ENABLE_SUITESPARSE 1
-
 #include <map>
 
+#include "ceres/ceres.h"
+#include "ceres/rotation.h"
 #include "libmv/base/vector.h"
 #include "libmv/logging/logging.h"
 #include "libmv/multiview/fundamental.h"
@@ -31,218 +31,327 @@
 #include "libmv/simple_pipeline/bundle.h"
 #include "libmv/simple_pipeline/reconstruction.h"
 #include "libmv/simple_pipeline/tracks.h"
-#include "third_party/ssba/Geometry/v3d_cameramatrix.h"
-#include "third_party/ssba/Geometry/v3d_metricbundle.h"
-#include "third_party/ssba/Math/v3d_linear.h"
-#include "third_party/ssba/Math/v3d_linear_utils.h"
 
 namespace libmv {
 
-void EuclideanBundle(const Tracks &tracks,
-                     EuclideanReconstruction *reconstruction) {
-  CameraIntrinsics intrinsics;
-  EuclideanBundleCommonIntrinsics(tracks,
-                                  BUNDLE_NO_INTRINSICS,
-                                  reconstruction,
-                                  &intrinsics);
-}
+// The intrinsics need to get combined into a single parameter block; use these
+// enums to index instead of numeric constants.
+enum {
+  OFFSET_FOCAL_LENGTH,
+  OFFSET_PRINCIPAL_POINT_X,
+  OFFSET_PRINCIPAL_POINT_Y,
+  OFFSET_K1,
+  OFFSET_K2,
+  OFFSET_K3,
+  OFFSET_P1,
+  OFFSET_P2,
+};
 
-void EuclideanBundleCommonIntrinsics(const Tracks &tracks,
-                                     int bundle_intrinsics,
-                                     EuclideanReconstruction *reconstruction,
-                                     CameraIntrinsics *intrinsics) {
-  LG << "Original intrinsics: " << *intrinsics;
-  vector<Marker> markers = tracks.AllMarkers();

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list