[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56709] branches/vgroup_modifiers: svn merge -r 56636:56707 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Bastien Montagne
montagne29 at wanadoo.fr
Sun May 12 16:21:24 CEST 2013
Revision: 56709
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56709
Author: mont29
Date: 2013-05-12 14:21:24 +0000 (Sun, 12 May 2013)
Log Message:
-----------
svn merge -r 56636:56707 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/vgroup_modifiers/extern/libmv/ChangeLog
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/vgroup_modifiers/extern/libmv/third_party/glog/src/windows/port.h
branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py
branches/vgroup_modifiers/intern/cycles/blender/blender_curves.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_sync.h
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_microfacet.h
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_ward.h
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_services.cpp
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_services.h
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_bump.osl
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_normal_map.osl
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_rgb_ramp.osl
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_displace.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_ramp.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_tex_coord.h
branches/vgroup_modifiers/intern/cycles/render/graph.cpp
branches/vgroup_modifiers/intern/cycles/render/graph.h
branches/vgroup_modifiers/intern/cycles/render/nodes.cpp
branches/vgroup_modifiers/intern/cycles/render/nodes.h
branches/vgroup_modifiers/intern/cycles/render/shader.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.h
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/vgroup_modifiers/intern/guardedalloc/MEM_guardedalloc.h
branches/vgroup_modifiers/release/scripts/startup/bl_operators/node.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/object_quick_effects.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/view3d.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py
branches/vgroup_modifiers/source/blender/blenfont/intern/blf_font.c
branches/vgroup_modifiers/source/blender/blenfont/intern/blf_glyph.c
branches/vgroup_modifiers/source/blender/blenfont/intern/blf_internal.h
branches/vgroup_modifiers/source/blender/blenfont/intern/blf_internal_types.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_brush.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/editderivedmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/fcurve.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/lamp.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/material.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/smoke.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_listbase.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_geom.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_utildefines.h
branches/vgroup_modifiers/source/blender/blenlib/intern/edgehash.c
branches/vgroup_modifiers/source/blender/blenlib/intern/listbase.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_geom.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_matrix.c
branches/vgroup_modifiers/source/blender/blenlib/intern/string.c
branches/vgroup_modifiers/source/blender/blenlib/intern/string_cursor_utf8.c
branches/vgroup_modifiers/source/blender/blenlib/intern/string_utf8.c
branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
branches/vgroup_modifiers/source/blender/bmesh/CMakeLists.txt
branches/vgroup_modifiers/source/blender/bmesh/bmesh.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_core.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_utils.c
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_GroupNode.h
branches/vgroup_modifiers/source/blender/editors/armature/armature_ops.c
branches/vgroup_modifiers/source/blender/editors/curve/curve_ops.c
branches/vgroup_modifiers/source/blender/editors/include/ED_transform.h
branches/vgroup_modifiers/source/blender/editors/include/ED_uvedit.h
branches/vgroup_modifiers/source/blender/editors/include/UI_interface.h
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_widgets.c
branches/vgroup_modifiers/source/blender/editors/interface/resources.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_data.c
branches/vgroup_modifiers/source/blender/editors/mesh/meshtools.c
branches/vgroup_modifiers/source/blender/editors/object/object_edit.c
branches/vgroup_modifiers/source/blender/editors/render/render_internal.c
branches/vgroup_modifiers/source/blender/editors/render/render_preview.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/vgroup_modifiers/source/blender/editors/space_action/action_ops.c
branches/vgroup_modifiers/source/blender/editors/space_clip/clip_intern.h
branches/vgroup_modifiers/source/blender/editors/space_clip/clip_ops.c
branches/vgroup_modifiers/source/blender/editors/space_clip/space_clip.c
branches/vgroup_modifiers/source/blender/editors/space_file/file_draw.c
branches/vgroup_modifiers/source/blender/editors/space_graph/graph_ops.c
branches/vgroup_modifiers/source/blender/editors/space_logic/logic_window.c
branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_ops.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_draw.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_ops.c
branches/vgroup_modifiers/source/blender/editors/space_text/space_text.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawmesh.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_header.c
branches/vgroup_modifiers/source/blender/editors/transform/transform.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_conversions.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_orientations.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_buttons.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_draw.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_intern.h
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_ops.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/vgroup_modifiers/source/blender/gpu/intern/gpu_extensions.c
branches/vgroup_modifiers/source/blender/gpu/intern/gpu_simple_shader.c
branches/vgroup_modifiers/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf.h
branches/vgroup_modifiers/source/blender/imbuf/intern/jpeg.c
branches/vgroup_modifiers/source/blender/imbuf/intern/rectop.c
branches/vgroup_modifiers/source/blender/makesdna/DNA_smoke_types.h
branches/vgroup_modifiers/source/blender/makesrna/RNA_access.h
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_particle.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_smoke.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_ui_api.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean.c
branches/vgroup_modifiers/source/blender/nodes/NOD_static_types.h
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
branches/vgroup_modifiers/source/blender/render/extern/include/RE_pipeline.h
branches/vgroup_modifiers/source/blender/render/intern/include/render_types.h
branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c
branches/vgroup_modifiers/source/blender/render/intern/source/external_engine.c
branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
branches/vgroup_modifiers/source/blender/windowmanager/WM_keymap.h
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c
branches/vgroup_modifiers/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageBuff.cpp
Added Paths:
-----------
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_bridge.c
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
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:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56636
+ /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:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56707
Modified: branches/vgroup_modifiers/extern/libmv/ChangeLog
===================================================================
--- branches/vgroup_modifiers/extern/libmv/ChangeLog 2013-05-12 14:13:29 UTC (rev 56708)
+++ branches/vgroup_modifiers/extern/libmv/ChangeLog 2013-05-12 14:21:24 UTC (rev 56709)
@@ -1,3 +1,57 @@
+commit 3886b488575ec5e79debce7b9f2e9824f5297c0f
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Fri May 10 12:23:03 2013 +0600
+
+ Add check for points behind camera in euclidan BA cost functor
+
+ In cases keyframes are no so good, algebraic two frames construction
+ could produce result, for which more aggressive Ceres-based BA code
+ will fall to a solution for which points goes behind the camera,
+ which is not so nice.
+
+ Seems in newer Ceres returning false from cost functor wouldn't
+ abort solution, but will restrict solver from moving points behind
+ the camera.
+
+ Works fine in own tests, but requires more tests.
+
+commit a5699d7dbe126024673f51aaa570f9f244f8da2f
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Wed Apr 24 22:06:38 2013 +0600
+
+ Forgot to add reconstruction scale to CMakeLists
+
+commit 2b7d2b44e6446bbcc23038f5dbb824feca888069
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Wed Apr 24 19:40:39 2013 +0600
+
+ Reconstructed scene scale ambiguity improvement
+
+ Added a function EuclideanScaleToUnity() which is
+ aimed to solve scale ambiguity by scaling solution
+ in a way cameras centers variance in unity.
+
+ Currently only available for euclidean pipeline,
+ projective one is not finished anyway.
+
+commit ed1f650576dc6f5b648a026a2861c54827b0f5c9
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Tue Apr 23 01:41:29 2013 +0600
+
+ Use epsilon in modal solver test
+
+ Default epsilon for isApprox was too small,
+ leading to some false test failures.
+
+commit c44679a9a0fafdde6a0a22e7e5c8496fc9c93cd0
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Tue Apr 23 01:35:56 2013 +0600
+
+ Update Ceres to current HEAD
+
+ Brings optimization for DENSE_NORMAL_CHOLESKY and
+ also fixes threading issues with BLAS.
+
commit 03cbc88ce7f51aa26ba503acea2e984bcb78873c
Author: Sergey Sharybin <sergey.vfx at gmail.com>
Date: Mon Apr 15 05:35:33 2013 +0600
@@ -593,101 +647,3 @@
Date: Thu Dec 20 18:46:09 2012 +0600
Cosmetic change to correspondences reports in keyframe selection
-
-commit ceaf80c987ec0338e7e83965bc808411453eb755
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Thu Dec 20 18:08:03 2012 +0600
-
- Various fixes:
-
- - That was a typo in symmetric geometric cost functor, which
- computed inverse distance in a wrong way.
-
- - Fixed compilation of unit tests
-
- - Added simple test for keyframe selection. Currently only
- covers case that neighbor frames with only translation
- (homography should be better than fundamental) are not
- considered a keyframes.
-
- Still need to be investigated why it only works if tracks
- are in pixel space and why doesn't work in normalized space.
-
-commit cfabdfe48df2add3d1f30cf4370efd0b31990ab0
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Thu Dec 20 05:46:53 2012 +0600
-
- Assorted fixes for keyframe selection:
-
- - Biggest error was in cost functors used for F and H refirement,
- they were just wrong.
-
- - Use natural logarithms, since it's actually makes sense from
- math papers point of view and error is somewhere else.
-
- - Disabled rho for GRIC, for now use non-clamped error for tests.
-
- - Made SymmetricEpipolarDistance returning non-squared distance
- Keyframe selection is currently the only used of this function
- and it seems using non-squared distance makes much more sense.
-
- Also would think to append suffix "Squared" to functions which
- returns squared distances.
-
- - Removed templated version of SymmetricEpipolarDistance, since
- it's not needed actually.
-
- This is actually even worse working than previous implementation,
- but commit it needed for further review.
-
-commit 35d8c57626ad74818f155e6e5960c663ea84e032
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Thu Dec 20 03:00:40 2012 +0600
-
- Euclidean resection cost function didn't use correct constructor
-
- It was storing a reference to initial rotation passed by value,
- leading to pointer being pointing to a stack variable, leading to
- wrong memory access in residuals computing.
-
- Apparently was visible in optimized builds only with inline
- substitution allowed.
-
-commit 0798d3162bb49cee7e1c423ceccbca1326ad5650
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Thu Dec 20 02:50:52 2012 +0600
-
- Automatic keyframe selection based on Pollefeys's criteria
-
- This commit implements automatic keyframe selection algorithm
- based on Pollefeys's criteria (F-GRIC is smaller than H-GRIC
- and correspondence ratio is more then 90%).
-
- It is implemented as a part of simple pipeline and returns
- vector of keyframe images for a given Tracks structure.
-
- For simple pipeline reconstruction two best keyframes are
- expected to be selected from all detected candidates.
- Criteria for this selection could be reprojection error of
- solution from two candidate keyfames.
-
- Unfortunately, it's not fully workable yet, hopefully would
- be fixed soon.
-
-commit e943985552f0598ae122252876f305d72c25c2f9
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Thu Dec 6 17:47:11 2012 +0600
-
- Camera Tracking: allow fallback to reprojection resection
- by user demand
-
- This fixes some "regressions" introduced in previous commit
- which lead to much worse solution in some cases. Now it's
- possible to bring old behavior back.
-
- Perhaps it's more like temporal solution for time being smarter
- solution is found. But finding such a solution isn't so fast,
- so let's bring manual control over reprojection usage.
-
- But anyway, imo it's now nice to have a structure which could
- be used to pass different settings to the solver.
Modified: branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/bundle.cc
===================================================================
--- branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/bundle.cc 2013-05-12 14:13:29 UTC (rev 56708)
+++ branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/bundle.cc 2013-05-12 14:21:24 UTC (rev 56709)
@@ -93,29 +93,19 @@
T predicted_x, predicted_y;
- // EuclideanBundle uses empty intrinsics, which breaks undistortion code;
- // so use an implied focal length of 1.0 if the focal length is exactly
- // zero.
- // TODO(keir): Figure out a better way to do this.
- if (focal_length != T(0)) {
- // Apply distortion to the normalized points to get (xd, yd).
- // TODO(keir): Do early bailouts for zero distortion; these are expensive
- // jet operations.
+ // Apply distortion to the normalized points to get (xd, yd).
+ // TODO(keir): Do early bailouts for zero distortion; these are expensive
+ // jet operations.
+ ApplyRadialDistortionCameraIntrinsics(focal_length,
+ focal_length,
+ principal_point_x,
+ principal_point_y,
+ k1, k2, k3,
+ p1, p2,
+ xn, yn,
+ &predicted_x,
+ &predicted_y);
- ApplyRadialDistortionCameraIntrinsics(focal_length,
- focal_length,
- principal_point_x,
- principal_point_y,
- k1, k2, k3,
- p1, p2,
- xn, yn,
- &predicted_x,
- &predicted_y);
- } else {
- predicted_x = xn;
- predicted_y = yn;
- }
-
// The error is the difference between the predicted and observed position.
residuals[0] = predicted_x - T(observed_x);
residuals[1] = predicted_y - T(observed_y);
Modified: branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list