Blender Git Loki

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

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

Merge branch 'master' into viewport_experiments

Color Wire: improve method of tinting colors

also improve method to ensure contrast with background

DOF effect works :)

Unused leftover debug variable.

Reimplemented the voxel texture type for displaying hair continuum grids.

Expose hair grid info in the RNA (read-only); it can be useful for
debugging purposes.

Debug visualization code of a slice of the hair velocity vector field.

Removed arbitrary factor 2.0 on volumetric hair friction factor.

This was introducing energy into the system for any factor beyond 0.5
and caused major instability.

Fill the hair volume grid with the _new_ velocities from the first
solver step, instead of using the previous step's velocities.

Merge branch 'master' into viewport_experiments

Debug drawing feature to visualize the hair continuum grid.

Perform grid-based velocity smoothing for hair outside of the implicit
solver step.

Calculating forces and jacobians from linearly interpolated grid values
is problematic due to discontinuities at the grid boundaries. The new
approach of modifying velocities after the backward euler solver step
was suggested in a newer paper

"Detail Preserving Continuum Simulation of Straight Hair"
(McAdams, Selle 2009)

Merge branch 'master' into gooseberry

Experimental color wire-frame (for testing in the studio)

Fix for warnings/errors

Merge branch 'master' into hair_immediate_fixes

Removed unused variable.