[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60519] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Thu Oct 3 07:37:49 CEST 2013
Revision: 60519
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60519
Author: gdh
Date: 2013-10-03 05:37:49 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
Merged trunk into branch. Includes r60461 to r60517.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60461
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60517
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.cc
branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.h
branches/soc-2013-cycles_mblur/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_opencl.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_film.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
branches/soc-2013-cycles_mblur/intern/cycles/util/util_system.cpp
branches/soc-2013-cycles_mblur/intern/cycles/util/util_types.h
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_action.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_animsys.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/action.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/multires.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/paint.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/texture.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/keyframes_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/keyframing.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_naming.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_shading.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/screendump.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_console/space_console.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_info/info_stats.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_snap.c
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_define.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-60460
+ /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,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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-60517
Modified: branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.cc
===================================================================
--- branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.cc 2013-10-03 05:27:39 UTC (rev 60518)
+++ branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.cc 2013-10-03 05:37:49 UTC (rev 60519)
@@ -446,14 +446,16 @@
};
/* Fundamental transformation estimation. */
-bool FundamentalFromCorrespondencesEuc(const Mat &x1,
- const Mat &x2,
- const FundamentalEstimationOptions &options,
- Mat3 *F) {
+bool FundamentalFromCorrespondencesEuc(
+ const Mat &x1,
+ const Mat &x2,
+ const FundamentalEstimationOptions &options,
+ Mat3 *F) {
// Step 1: Algebraic fundamental estimation.
bool algebraic_success = NormalizedEightPointSolver(x1, x2, F);
- LG << "Algebraic result " << algebraic_success << ", estimated matrix " << F;
+ LG << "Algebraic result " << algebraic_success
+ << ", estimated matrix:\n" << *F;
if (!algebraic_success && !options.use_refine_if_algebraic_fails) {
return false;
@@ -470,7 +472,7 @@
problem.AddResidualBlock(
new ceres::AutoDiffCostFunction<
FundamentalSymmetricEpipolarCostFunctor,
- 2, /* num_residuals */
+ 2, // num_residuals
9>(fundamental_symmetric_epipolar_cost_function),
NULL,
F->data());
@@ -490,10 +492,9 @@
VLOG(1) << "Summary:\n" << summary.FullReport();
- LG << "Final refined matrix: " << F;
+ LG << "Final refined matrix:\n" << *F;
return !(summary.termination_type == ceres::DID_NOT_RUN ||
- summary.termination_type == ceres::NO_CONVERGENCE ||
summary.termination_type == ceres::NUMERICAL_FAILURE);
}
Modified: branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.h
===================================================================
--- branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.h 2013-10-03 05:27:39 UTC (rev 60518)
+++ branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.h 2013-10-03 05:37:49 UTC (rev 60519)
@@ -151,22 +151,22 @@
* Defaults should be suitable for a wide range of use cases, but
* better performance and accuracy might require tweaking/
*/
-typedef struct FundamentalEstimationOptions {
- /* Default constructor which sets up a options for generic usage. */
+struct FundamentalEstimationOptions {
+ // Default constructor which sets up a options for generic usage.
FundamentalEstimationOptions(void);
- /* Refine fundamental matrix even if algebraic estimation reported failure. */
+ // Refine fundamental matrix even if algebraic estimation reported failure.
bool use_refine_if_algebraic_fails;
- /* Maximal number of iterations for refinement step. */
+ // Maximal number of iterations for refinement step.
int max_num_iterations;
- /* Paramaneter tolerance used by minimizer termination criteria. */
+ // Paramaneter tolerance used by minimizer termination criteria.
float parameter_tolerance;
- /* Function tolerance used by minimizer termination criteria. */
+ // Function tolerance used by minimizer termination criteria.
float function_tolerance;
-} FundamentalEstimationOptions;
+};
/**
* Fundamental transformation estimation.
@@ -175,10 +175,11 @@
* correspondences by doing algebraic estimation first followed with result
* refinement.
*/
-bool FundamentalFromCorrespondencesEuc(const Mat &x1,
- const Mat &x2,
- const FundamentalEstimationOptions &options,
- Mat3 *F);
+bool FundamentalFromCorrespondencesEuc(
+ const Mat &x1,
+ const Mat &x2,
+ const FundamentalEstimationOptions &options,
+ Mat3 *F);
} // namespace libmv
Modified: branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.cc
===================================================================
--- branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.cc 2013-10-03 05:27:39 UTC (rev 60518)
+++ branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.cc 2013-10-03 05:37:49 UTC (rev 60519)
@@ -185,9 +185,11 @@
H_x /= H_x(2);
Hinv_y /= Hinv_y(2);
+ // This is a forward error.
residuals[0] = H_x(0) - T(y_(0));
residuals[1] = H_x(1) - T(y_(1));
+ // This is a backward error.
residuals[2] = Hinv_y(0) - T(x_(0));
residuals[3] = Hinv_y(1) - T(x_(1));
@@ -201,11 +203,12 @@
/** 2D Homography transformation estimation in the case that points are in
* euclidean coordinates.
*/
-bool Homography2DFromCorrespondencesEuc(const Mat &x1,
- const Mat &x2,
- const HomographyEstimationOptions &options,
- Mat3 *H) {
- /* TODO(sergey): Support homogenous coordinates, not just euclidean. */
+bool Homography2DFromCorrespondencesEuc(
+ const Mat &x1,
+ const Mat &x2,
+ const HomographyEstimationOptions &options,
+ Mat3 *H) {
+ // TODO(sergey): Support homogenous coordinates, not just euclidean.
assert(2 == x1.rows());
assert(4 <= x1.cols());
@@ -217,7 +220,8 @@
Homography2DFromCorrespondencesLinear(x1, x2, H,
options.expected_algebraic_precision);
- LG << "Algebraic result " << algebraic_success << ", estimated matrix " << H;
+ LG << "Algebraic result " << algebraic_success
+ << ", estimated matrix:\n" << *H;
if (!algebraic_success && !options.use_refine_if_algebraic_fails) {
return false;
@@ -234,7 +238,7 @@
problem.AddResidualBlock(
new ceres::AutoDiffCostFunction<
HomographySymmetricGeometricCostFunctor,
- 4, /* num_residuals */
+ 4, // num_residuals
9>(homography_symmetric_geometric_cost_function),
NULL,
H->data());
@@ -254,10 +258,9 @@
VLOG(1) << "Summary:\n" << summary.FullReport();
- LG << "Final refined matrix: " << H;
+ LG << "Final refined matrix:\n" << *H;
return !(summary.termination_type == ceres::DID_NOT_RUN ||
- summary.termination_type == ceres::NO_CONVERGENCE ||
summary.termination_type == ceres::NUMERICAL_FAILURE);
}
Modified: branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.h
===================================================================
--- branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.h 2013-10-03 05:27:39 UTC (rev 60518)
+++ branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.h 2013-10-03 05:37:49 UTC (rev 60519)
@@ -60,25 +60,25 @@
* Defaults should be suitable for a wide range of use cases, but
* better performance and accuracy might require tweaking/
*/
-typedef struct HomographyEstimationOptions {
- /* Default constructor which sets up a options for generic usage. */
+struct HomographyEstimationOptions {
+ // Default constructor which sets up a options for generic usage.
HomographyEstimationOptions(void);
- /* Expected precision of algebraic estimation. */
+ // Expected precision of algebraic estimation.
double expected_algebraic_precision;
- /* Refine homography even if algebraic estimation reported failure. */
+ // Refine homography even if algebraic estimation reported failure.
bool use_refine_if_algebraic_fails;
- /* Maximal number of iterations for refinement step. */
+ // Maximal number of iterations for refinement step.
int max_num_iterations;
- /* Paramaneter tolerance used by minimizer termination criteria. */
+ // Paramaneter tolerance used by minimizer termination criteria.
float parameter_tolerance;
- /* Function tolerance used by minimizer termination criteria. */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list