Blender Git Commits

Merge branch 'master' into soc-2014-shapekey

new splash screen and fixes for convert to keyframe operator, empty was parented incorrectly (depgraph update missing, but threaded option is broken now)

Merge branch 'master' into soc-2014-shapekey

Conflicts:
source/blender/windowmanager/intern/wm_operators.c

Tweaks to skey compression: switch from userpref option to savefile op option.

Makes more sense, and follow what we did e.g. for BMesh.

Fix for previous merge.

Color Wire: improve method of tinting colors

also improve method to ensure contrast with background

Merge branch 'master' into soc-2014-shapekey

bugfix, convert to keyframed objects didnt work when escape was used to stop the simulation before

optional job system for convert to keyframed objects, faster conversion, and taking bakes into account

Bake modifier simulation to keyframed objects directly

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.

GPencil Stroke Editing: More popularly requested transform tools

* Bend
* Shear
* To Sphere