Blender Git Loki

Tomato: syncronize with changes in libmv branch with assorted fixes

- 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.

- Changed main keyframe selection cycle, so in cases there're no
more next keyframes for current keyframe could be found in the
image sequence, current keyframe would be moved forward and
search continues.

This helps in cases when there's poor motion in the beginning
of the sequence, then markers becomes occluded. There could be
good keyframes in the middle of the shot still.

- Moved correspondences constraint to the top, so no H/F estimation
happens if there's bad correspondence. Makes algorithm go a bit
faster.

Selection still behaves very much fuzzy and still working on this.

Tomato: added missing files to template generator

Merging r53203 through r53211 from trunk into soc-2011-tomato

Merging r52895 through r53202 from trunk into soc-2011-tomato

svn merge ^/trunk/blender -c53172

finishing touches - BLENDER_VERSION_CHAR = a

svn merge ^/trunk/blender -c53096 -c53112 -c53123 -c53129

svn merge ^/trunk/blender -c53148

svn merge ^/trunk/blender -c 53107

svn merge ^/trunk/blender -c53102 -c53103 -c53104 -c53105

svn merge ^/trunk/blender -c53086 -c53087 -c53090 -c53095

Manual merge of r53005 by Brecht to the "a" tag:
* Cycles: make "Open Shading Language" a boolean toggle, the other option "GPU Compatible" was confusing.

svn merge ^/trunk/blender -c52867 -c52870 -c52871 -c52883 -c52891 -c52910 -c52915 -c52919 -c52928 -c52930 -c52945 -c52958 -c52977 -c52994 -c52995 -c52996 -c52997 -c52998 -c53015 -c53037 -c53038 -c53039 -c53056 -c53061 -c53063 -c53065 -c53066 -c53067 -c53077 -c52966 -c52981

Camera tracking: fixed for automatic keyframe selection

Previously GRIC wasn't working because of typo in getting vector
dimension which are vector-columns, not vector rows.

This implied some additional changes to make selector working nicer:

- lambda coefficients in GRIC were changed form natural to base-10,
otherwise sums of rho functions are much smaller than constant
part of GRIC.
This also seems to correlate with papers where log() usually means
base-10 logarithm.

- Limited correspondence ratio from top, which will give better
results because it usually means longer base line.

- Made logging more useful.

Merging r52852 through r52894 from trunk into soc-2011-tomato

Merge in fix for building with cmake, doesn't effect our own builds, just means cmake will work with the source tarball.

svn merge ^/trunk/blender -r52863:52864

Camera tracking: fix for incorrect two ketframe selection criteria

Reprojection error of a solution should be calculated for tracks in
image space, not in normalized space.

Merging r52851 through r52858 from trunk into blender-2.65-release

Motion tracking: automatic keyframe selection

This commit contains implementation of 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 selecting from list
of all possible keyframes. Criteria for this selection is reprojection error
of solution from two candidate keyfames.

In Blender side added an option in Solve panel to enable Keyframe Selection.
If this option enabled, libmv will detect two best keyframes and use them for
solution. This keyframes will be set back to the interface when solution is
done.

Merging r52848 through r52850 from trunk into blender-2.65-release