Blender Git Commits

Merge branch 'master' into soc-2014-shapekey

Conflicts:
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/intern/key.c

Better icons (use one tri + bar to symbolyze 'ultimate' left/right/up/down).

More universal and sensible (double tri usually means 'quicker' rather than 'farther').

Merge branch 'master' into soc-2014-shapekey

and back again (sticky keys testbuild)

Revert "sticky keys testbuild"

This reverts commit abb25a07891f286ee9f25ec9aecaf2101ffb1ef8.

sticky keys testbuild

Libmv: Fix stupidness in termination criteria

Need to skip current track, not to stop syncing current frame.

Merge branch 'master' into libmv_prediction

Libmv: Correction for previous commit - wrong axis used for AABB calculation

Normalize the depth to the -1.0 to 1.0 range as well.

Libmv: Bring back track margin check

Add shader files to the source tree. It helps by displaying them in the
IDE

Libmv: Use proper termination criteria based on the region tracker result

Fix compilation error with disabled libmv

Merge branch 'master' into libmv_prediction

Merge branch 'master' into viewport_experiments

slightly less verbose version of previous work.

Full rewrite of 'move shapekeys' code.

Now handles correctly position of absolute skeys in all cases. Also only does one
full loop over whole list.

Ans some more cleanup.

Merge branch 'master' into terrible_consequencer

Conflicts:
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_ops.c

Trim tool:

Support metastrips and multiple strips at once.