Blender Git Loki

fixing previously bad merge

fix some errors

Merge branch 'master' into terrible_consequencer

Conflicts:
source/blender/editors/include/UI_view2d.h
source/blender/editors/space_sequencer/sequencer_edit.c

Split clnor modifier in two (one for generate, one for copyfrom), and add 'tracto' generate mode.

Note 'CopySplitNormalModifier' is doomed to be merged/replace by a generic 'TransferData' one
once mesh transfer data work is finished.

Add another level of small blur to bridge between no/medium blurring.

Algorithm used is now a full implementation of

"Practical Post-Process depth of field", presented here [1],
with a few modifications as to how circle of confusion is
applied at the final pass.

[1] http://http.developer.nvidia.com/GPUGems3/gpugems3_ch28.html

Moved C API functions for individual data types into their respective
files to simplify the code structure.

Merge branch 'master' into soc-2014-bge

Conflicts:
source/blender/blenkernel/intern/object.c

Address some review points: always use clnors is present (bypass 'Autosmooth' setting).

Also moved create/delete clnors data button to Geometry Data panel

Merge branch 'master' into viewport_experiments

Cleanup: BM_elem_flag_test_bool isn't needed for nonzero checks

Cleanup: arg order (return arg last)

Cleanup: no need to include headers

Cleanup: use BKE_lnor_spaces_*** prefix for loop-normal functions

Merge branch 'master' into temp_custom_loop_normals

Add Freestyle edge/face marks.

Trivial. And I think that's the last missing bits.

SKey remains TODO, but would rather see how this mix with soc branch first...

Hide 'Skin' data option from UI for now, it's not available in final DM (first skin mod removes it).

Some minor stupid bugfix.

Merge branch 'master' into mesh-transfer-data

wturbulence for mantaflow

division between high-res and low-res manta operations