Blender Git Loki

Merge branch 'master' into soc-2016-multiview

Merge branch 'master' into soc-2016-multiview

remove several debug info

Merge branch 'master' into soc-2016-multiview

use name instead of pointer in correspondence

- remove self_track and other_track pointers in MovieTrackCorrespondence,
instead use self_track_name and other_track_name.
- now we can save and load correspondences reliably.
- one issue after this change is that the color of linked tracks are not
shown correctly.

Merge branch 'master' into soc-2016-multiview

Merge branch 'master' into soc-2016-multiview

It seems that we have some changes in multiview stablization
happened in the master branch. Solve the conflicts in versioning.

now multi-view can work with more than 2 cameras

solve the camera number limitation by iterating over main->movieclip.

Multiview tracking count clip using main.movieclip

- using open clip given by main->movieclip
- haven't set up clip pointer using main.movieclip

Merge branch 'master' into soc-2016-multiview

Fix incorrect version check

Was just always running.

Correctly convert old clip editor data to new one

Instead of just using defaults.

Fix compiling with blenderplayer

revise versioning code for RegionSpaceClip

Thank Julian Eisel for pointing out the error. Also remove the version
bump.

fix last commit, solve "Motion Tracking" layout

should be using area, instead of space_clip for iteration.

do versioning of RegionSpaceClip

This commit may be useless since there is no region data in a space_clip
at the beginning of Blender. So a valid ARegion cannot be found for
ar->regiondata to new.

remove one line of setting zoom

it is not needed since we have RegionSpaceClip now.

fix error in ED_space_clip_get_clip_in_region

didn't consider the case that regiondata may be a NULL pointer. Since
dopesheet and graph are also Movie Editors and they don't have
regiondata. Other drawing code also has this problem, so it is not fully
solved. Will need to initialize regiondata for dopesheet and graph.

Merge branch 'master' into soc-2016-multiview

add secondary_clip I/O to writefile and readfile

The ->secondary_clip save/load code basically follows the save pattern
of ->clip. It works but may be incomplete, need to be checked.