[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60885] branches/soc-2013-paint: merge with trunk 60884
Antony Riakiotakis
kalast at gmail.com
Mon Oct 21 21:01:34 CEST 2013
Revision: 60885
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60885
Author: psy-fi
Date: 2013-10-21 19:01:33 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
merge with trunk 60884
Modified Paths:
--------------
branches/soc-2013-paint/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2013-paint/extern/libmv/libmv/multiview/euclidean_resection.h
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/resect.cc
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/resect.h
branches/soc-2013-paint/extern/libmv/libmv-capi.cc
branches/soc-2013-paint/extern/libmv/libmv-capi.h
branches/soc-2013-paint/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_object.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_sync.h
branches/soc-2013-paint/intern/cycles/device/device.cpp
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_blackbody.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_combine_hsv.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_separate_hsv.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_vector_transform.osl
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_vector_transform.h
branches/soc-2013-paint/intern/cycles/render/blackbody.cpp
branches/soc-2013-paint/intern/cycles/render/blackbody.h
branches/soc-2013-paint/intern/cycles/render/buffers.cpp
branches/soc-2013-paint/intern/cycles/render/object.cpp
branches/soc-2013-paint/intern/guardedalloc/intern/mallocn_lockfree_impl.c
branches/soc-2013-paint/release/datafiles/splash.png
branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2013-paint/release/scripts/modules/bpy/utils.py
branches/soc-2013-paint/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-paint/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-paint/release/scripts/startup/bl_operators/view3d.py
branches/soc-2013-paint/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_time.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-paint/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_idprop.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_object.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_texture.h
branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/curve.c
branches/soc-2013-paint/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mball.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh_evaluate.c
branches/soc-2013-paint/source/blender/blenkernel/intern/object.c
branches/soc-2013-paint/source/blender/blenkernel/intern/scene.c
branches/soc-2013-paint/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-paint/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-paint/source/blender/blenkernel/intern/texture.c
branches/soc-2013-paint/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-paint/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-paint/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-paint/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-paint/source/blender/blenlib/BLI_sys_types.h
branches/soc-2013-paint/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
branches/soc-2013-paint/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-paint/source/blender/bmesh/bmesh_tools.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-paint/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2013-paint/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2013-paint/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2013-paint/source/blender/editors/animation/anim_filter.c
branches/soc-2013-paint/source/blender/editors/animation/anim_markers.c
branches/soc-2013-paint/source/blender/editors/animation/keyframing.c
branches/soc-2013-paint/source/blender/editors/armature/pose_select.c
branches/soc-2013-paint/source/blender/editors/curve/editcurve.c
branches/soc-2013-paint/source/blender/editors/include/ED_armature.h
branches/soc-2013-paint/source/blender/editors/include/ED_object.h
branches/soc-2013-paint/source/blender/editors/include/ED_view3d.h
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-paint/source/blender/editors/interface/interface_intern.h
branches/soc-2013-paint/source/blender/editors/interface/interface_templates.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-paint/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-paint/source/blender/editors/object/object_bake.c
branches/soc-2013-paint/source/blender/editors/object/object_hook.c
branches/soc-2013-paint/source/blender/editors/object/object_relations.c
branches/soc-2013-paint/source/blender/editors/render/render_shading.c
branches/soc-2013-paint/source/blender/editors/screen/screen_ops.c
branches/soc-2013-paint/source/blender/editors/screen/screendump.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_editor.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_intern.h
branches/soc-2013-paint/source/blender/editors/space_clip/clip_utils.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-paint/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2013-paint/source/blender/editors/space_text/space_text.c
branches/soc-2013-paint/source/blender/editors/space_text/text_ops.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-paint/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-paint/source/blender/imbuf/intern/oiio/openimageio_api.cpp
branches/soc-2013-paint/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2013-paint/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_util.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_util.h
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_blackbody.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_vectTransform.c
branches/soc-2013-paint/source/blender/python/generic/idprop_py_api.c
branches/soc-2013-paint/source/blender/python/generic/idprop_py_api.h
branches/soc-2013-paint/source/blender/python/generic/py_capi_utils.c
branches/soc-2013-paint/source/blender/python/generic/py_capi_utils.h
branches/soc-2013-paint/source/blender/render/intern/source/bake.c
branches/soc-2013-paint/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-paint/source/blender/render/intern/source/pipeline.c
branches/soc-2013-paint/source/blender/render/intern/source/render_texture.c
branches/soc-2013-paint/source/blender/windowmanager/WM_keymap.h
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-paint/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_beautify.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_beautify.h
Property Changed:
----------------
branches/soc-2013-paint/
branches/soc-2013-paint/doc/python_api/examples/bpy.types.UIList.2.py
branches/soc-2013-paint/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
branches/soc-2013-paint/extern/libmv/libmv-capi_intern.h
branches/soc-2013-paint/extern/libmv/third_party/ceres/include/ceres/c_api.h
branches/soc-2013-paint/extern/libmv/third_party/ceres/include/ceres/covariance.h
branches/soc-2013-paint/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h
branches/soc-2013-paint/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.h
branches/soc-2013-paint/extern/rangetree/CMakeLists.txt
branches/soc-2013-paint/extern/wcwidth/CMakeLists.txt
branches/soc-2013-paint/intern/atomic/atomic_ops.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_blackbody.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_vector_transform.h
branches/soc-2013-paint/intern/cycles/render/blackbody.cpp
branches/soc-2013-paint/intern/cycles/render/sky_model.cpp
branches/soc-2013-paint/intern/cycles/render/sky_model.h
branches/soc-2013-paint/intern/cycles/render/sky_model_data.h
branches/soc-2013-paint/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
branches/soc-2013-paint/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
branches/soc-2013-paint/intern/ghost/test/multitest/stubs.c
branches/soc-2013-paint/intern/guardedalloc/intern/mallocn_intern.h
branches/soc-2013-paint/intern/guardedalloc/intern/mallocn_lockfree_impl.c
branches/soc-2013-paint/intern/locale/CMakeLists.txt
branches/soc-2013-paint/intern/opencolorio/CMakeLists.txt
branches/soc-2013-paint/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
branches/soc-2013-paint/release/datafiles/LICENSE-droidsans.ttf.txt
branches/soc-2013-paint/release/datafiles/blender_icons.svg
branches/soc-2013-paint/release/datafiles/prvicons.svg
branches/soc-2013-paint/release/scripts/freestyle/data/env_map/brown00.png
branches/soc-2013-paint/release/scripts/freestyle/data/env_map/gray00.png
branches/soc-2013-paint/release/scripts/freestyle/data/env_map/gray01.png
branches/soc-2013-paint/release/scripts/freestyle/data/env_map/gray02.png
branches/soc-2013-paint/release/scripts/freestyle/data/env_map/gray03.png
branches/soc-2013-paint/release/scripts/freestyle/data/textures/papers/whitepaper.jpg
branches/soc-2013-paint/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-paint/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-paint/release/scripts/startup/bl_operators/mask.py
branches/soc-2013-paint/release/text/GPL3-license.txt
branches/soc-2013-paint/release/text/jemalloc-license.txt
branches/soc-2013-paint/scons/scons-local/SCons/Action.py
branches/soc-2013-paint/scons/scons-local/SCons/Builder.py
branches/soc-2013-paint/scons/scons-local/SCons/CacheDir.py
branches/soc-2013-paint/scons/scons-local/SCons/Conftest.py
branches/soc-2013-paint/scons/scons-local/SCons/Debug.py
branches/soc-2013-paint/scons/scons-local/SCons/Defaults.py
branches/soc-2013-paint/scons/scons-local/SCons/Environment.py
branches/soc-2013-paint/scons/scons-local/SCons/Errors.py
branches/soc-2013-paint/scons/scons-local/SCons/Executor.py
branches/soc-2013-paint/scons/scons-local/SCons/Job.py
branches/soc-2013-paint/scons/scons-local/SCons/Memoize.py
branches/soc-2013-paint/scons/scons-local/SCons/Node/Alias.py
branches/soc-2013-paint/scons/scons-local/SCons/Node/FS.py
branches/soc-2013-paint/scons/scons-local/SCons/Node/Python.py
branches/soc-2013-paint/scons/scons-local/SCons/Node/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/BoolOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/EnumOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/ListOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/PackageOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/PathOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/PathList.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/aix.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/cygwin.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/darwin.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/hpux.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/irix.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/os2.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/posix.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/sunos.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/win32.py
branches/soc-2013-paint/scons/scons-local/SCons/SConf.py
branches/soc-2013-paint/scons/scons-local/SCons/SConsign.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/C.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/D.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/Dir.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/Fortran.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/IDL.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/LaTeX.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/Prog.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/RC.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/Interactive.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/Main.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/SConsOptions.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/SConscript.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Sig.py
branches/soc-2013-paint/scons/scons-local/SCons/Subst.py
branches/soc-2013-paint/scons/scons-local/SCons/Taskmaster.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/386asm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/BitKeeper.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/CVS.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/FortranCommon.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/GettextCommon.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/JavaCommon.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/arch.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/common.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/netframework.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/sdk.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/vc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/vs.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/Perforce.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/PharLapCommon.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/RCS.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/SCCS.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/Subversion.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/aixc++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/aixcc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/aixf77.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/aixlink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/applelink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/as.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/bcc32.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/c++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/cc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/cvf.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/default.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/dmd.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/dvi.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/dvipdf.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/dvips.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/f03.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/f77.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/f90.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/f95.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/filesystem.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/fortran.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/g++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/g77.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gas.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gcc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gettext.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gfortran.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gnulink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gs.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/hpc++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/hpcc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/hplink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/icc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/icl.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ifl.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ifort.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ilink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ilink32.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/install.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/intelc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ipkg.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/jar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/javac.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/javah.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/latex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/lex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/link.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/linkloc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/m4.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/masm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/midl.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mingw.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msgfmt.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msginit.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msgmerge.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mslib.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mslink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mssdk.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msvc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msvs.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mwcc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mwld.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/nasm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/ipk.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/msi.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/rpm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/src_tarbz2.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/src_targz.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/src_zip.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/tarbz2.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/targz.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/zip.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/pdf.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/pdflatex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/pdftex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/qt.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/rmic.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/rpcgen.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/rpm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/rpmutils.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sgiar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sgic++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sgicc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sgilink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunc++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/suncc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunf77.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunf90.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunf95.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunlink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/swig.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/tar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/tex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/textfile.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/tlib.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/wix.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/xgettext.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/yacc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/zip.py
branches/soc-2013-paint/scons/scons-local/SCons/Util.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/BoolVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/EnumVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/ListVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/PackageVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/PathVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Warnings.py
branches/soc-2013-paint/scons/scons-local/SCons/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_builtins.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_collections.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_dbm.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_hashlib.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_io.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_sets.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_subprocess.py
branches/soc-2013-paint/scons/scons-local/SCons/cpp.py
branches/soc-2013-paint/scons/scons-local/SCons/dblite.py
branches/soc-2013-paint/scons/scons-local/SCons/exitfuncs.py
branches/soc-2013-paint/source/blender/blenkernel/BKE_treehash.h
branches/soc-2013-paint/source/blender/blenkernel/intern/treehash.c
branches/soc-2013-paint/source/blender/blenlib/BLI_compiler_attrs.h
branches/soc-2013-paint/source/blender/blenlib/BLI_sort.h
branches/soc-2013-paint/source/blender/blenlib/BLI_task.h
branches/soc-2013-paint/source/blender/blenlib/intern/sort.c
branches/soc-2013-paint/source/blender/blenlib/intern/task.c
branches/soc-2013-paint/source/blender/blenloader/intern/versioning_defaults.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-paint/source/blender/compositor/intern/COM_Debug.cpp
branches/soc-2013-paint/source/blender/compositor/intern/COM_Debug.h
branches/soc-2013-paint/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
branches/soc-2013-paint/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_ConvertOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_ConvertOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/space_outliner/
branches/soc-2013-paint/source/blender/freestyle/CMakeLists.txt
branches/soc-2013-paint/source/blender/imbuf/intern/oiio/openimageio_api.cpp
branches/soc-2013-paint/source/blender/imbuf/intern/oiio/openimageio_api.h
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_vectTransform.c
Property changes on: branches/soc-2013-paint
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57386-60772
+ /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57386-60884
Property changes on: branches/soc-2013-paint/doc/python_api/examples/bpy.types.UIList.2.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2013-paint/extern/libmv/libmv/multiview/euclidean_resection.cc
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv/multiview/euclidean_resection.cc 2013-10-21 18:08:20 UTC (rev 60884)
+++ branches/soc-2013-paint/extern/libmv/libmv/multiview/euclidean_resection.cc 2013-10-21 19:01:33 UTC (rev 60885)
@@ -34,26 +34,20 @@
namespace euclidean_resection {
typedef unsigned int uint;
-
-bool EuclideanResectionPPnP(const Mat2X &x_camera,
- const Mat3X &X_world,
- Mat3 *R, Vec3 *t,
- double tolerance);
bool EuclideanResection(const Mat2X &x_camera,
const Mat3X &X_world,
Mat3 *R, Vec3 *t,
- ResectionMethod method,
- double success_threshold) {
+ ResectionMethod method) {
switch (method) {
case RESECTION_ANSAR_DANIILIDIS:
EuclideanResectionAnsarDaniilidis(x_camera, X_world, R, t);
break;
case RESECTION_EPNP:
- return EuclideanResectionEPnP(x_camera, X_world, R, t, success_threshold);
+ return EuclideanResectionEPnP(x_camera, X_world, R, t);
break;
case RESECTION_PPNP:
- return EuclideanResectionPPnP(x_camera, X_world, R, t, success_threshold);
+ return EuclideanResectionPPnP(x_camera, X_world, R, t);
break;
default:
LOG(FATAL) << "Unknown resection method.";
@@ -444,8 +438,7 @@
bool EuclideanResectionEPnP(const Mat2X &x_camera,
const Mat3X &X_world,
- Mat3 *R, Vec3 *t,
- double success_threshold) {
+ Mat3 *R, Vec3 *t) {
CHECK(x_camera.cols() == X_world.cols());
CHECK(x_camera.cols() > 3);
size_t num_points = X_world.cols();
@@ -553,14 +546,8 @@
//
// TODO(keir): Decide if setting this to infinity, effectively disabling the
// check, is the right approach. So far this seems the case.
- //
- // TODO(sergey): Made it an option for now, in some cases it makes sense to
- // still fallback to reprojection solution
- // For details see bug [#32765] from Blender bug tracker
+ double kSuccessThreshold = std::numeric_limits<double>::max();
- // double kSuccessThreshold = std::numeric_limits<double>::max();
- double kSuccessThreshold = success_threshold;
-
// Find the first possible solution for R, t corresponding to:
// Betas = [b00 b01 b11 b02 b12 b22 b03 b13 b23 b33]
// Betas_approx_1 = [b00 b01 b02 b03]
@@ -728,8 +715,7 @@
// other hand, it did work on the first try.
bool EuclideanResectionPPnP(const Mat2X &x_camera,
const Mat3X &X_world,
- Mat3 *R, Vec3 *t,
- double tolerance) {
+ Mat3 *R, Vec3 *t) {
int n = x_camera.cols();
Mat Z = Mat::Zero(n, n);
Vec e = Vec::Ones(n);
@@ -750,7 +736,7 @@
Mat E(n, 3);
int iteration = 0;
- tolerance = 1e-5;
+ double tolerance = 1e-5;
// TODO(keir): The limit of 100 can probably be reduced, but this will require
// some investigation.
while (error > tolerance && iteration < 100) {
Modified: branches/soc-2013-paint/extern/libmv/libmv/multiview/euclidean_resection.h
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv/multiview/euclidean_resection.h 2013-10-21 18:08:20 UTC (rev 60884)
+++ branches/soc-2013-paint/extern/libmv/libmv/multiview/euclidean_resection.h 2013-10-21 19:01:33 UTC (rev 60885)
@@ -49,14 +49,11 @@
* \param R Solution for the camera rotation matrix
* \param t Solution for the camera translation vector
* \param method The resection method to use.
- * \param success_threshold Threshold of an error which is still considered a success
- * (currently used by EPnP algorithm only)
*/
bool EuclideanResection(const Mat2X &x_camera,
const Mat3X &X_world,
Mat3 *R, Vec3 *t,
- ResectionMethod method = RESECTION_EPNP,
- double success_threshold = 1e-3);
+ ResectionMethod method = RESECTION_EPNP);
/**
* Computes the extrinsic parameters, R and t for a calibrated camera
@@ -117,7 +114,6 @@
* \param X_world 3D points in the world coordinate system
* \param R Solution for the camera rotation matrix
* \param t Solution for the camera translation vector
- * \param success_threshold Threshold of an error which is still considered a success
*
* This is the algorithm described in:
* "{EP$n$P: An Accurate $O(n)$ Solution to the P$n$P Problem", by V. Lepetit
@@ -126,9 +122,25 @@
*/
bool EuclideanResectionEPnP(const Mat2X &x_camera,
const Mat3X &X_world,
- Mat3 *R, Vec3 *t,
- double success_threshold = 1e-3);
+ Mat3 *R, Vec3 *t);
+/**
+ * Computes the extrinsic parameters, R and t for a calibrated camera from 4 or
+ * more 3D points and their images.
+ *
+ * \param x_camera Image points in normalized camera coordinates,
+ * e.g. x_camera = inv(K) * x_image
+ * \param X_world 3D points in the world coordinate system
+ * \param R Solution for the camera rotation matrix
+ * \param t Solution for the camera translation vector
+ *
+ * Straight from the paper:
+ * http://www.diegm.uniud.it/fusiello/papers/3dimpvt12-b.pdf
+ */
+bool EuclideanResectionPPnP(const Mat2X &x_camera,
+ const Mat3X &X_world,
+ Mat3 *R, Vec3 *t);
+
} // namespace euclidean_resection
} // namespace libmv
Modified: branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.cc
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.cc 2013-10-21 18:08:20 UTC (rev 60884)
+++ branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.cc 2013-10-21 19:01:33 UTC (rev 60885)
@@ -51,10 +51,9 @@
EuclideanBundle(tracks, reconstruction);
}
- static bool Resect(const ReconstructionOptions &options,
- const vector<Marker> &markers,
+ static bool Resect(const vector<Marker> &markers,
EuclideanReconstruction *reconstruction, bool final_pass) {
- return EuclideanResect(options, markers, reconstruction, final_pass);
+ return EuclideanResect(markers, reconstruction, final_pass);
}
static bool Intersect(const vector<Marker> &markers,
@@ -90,10 +89,8 @@
ProjectiveBundle(tracks, reconstruction);
}
- static bool Resect(const ReconstructionOptions &options,
- const vector<Marker> &markers,
+ static bool Resect(const vector<Marker> &markers,
ProjectiveReconstruction *reconstruction, bool final_pass) {
- (void) options; // Ignored.
(void) final_pass; // Ignored.
return ProjectiveResect(markers, reconstruction);
@@ -144,7 +141,6 @@
template<typename PipelineRoutines>
void InternalCompleteReconstruction(
- const ReconstructionOptions &options,
const Tracks &tracks,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list