Blender Git Loki

Some UI cleanup and bringback in sync with master (show frames for absolute keys was lost somehow).

Merge branch 'master' into soc-2014-shapekey

Merge branch 'master' into depsgraph_refactor

WIP support for meta trimming

Merge branch 'master' into terrible_consequencer

Build fix for 2.4x branch (CMake on recent Linux)

compile fixes after using more strict compilation settings, quiet some warnings effectively this way

More picky little 'master-synchronization'

Merge branch 'master' into soc-2014-shapekey

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/transform/transform_generics.c

Cleanup

Mostly, revert unrelevant changes from master, with a few style cleanup as well here and there.
No change in behavior expected!

Merge branch 'master' into soc-2014-shapekey

Merge branch 'master' into temp_custom_loop_normals

grrrr, forgot to ammend previous commit :/

Minor changes, nothing really new here.

crash fix: deleting fracture modifier helper objects left group objects with go->ob == NULL, which caused crashes in depgraph update, now also deleting group objects with go->ob == NULL

Merge branch 'master' into mesh-transfer-data

low-res: passing obstacles in-memory

Support for jumping between Grease Pencil keyframes

* Added support for jumping between Grease Pencil keyframes (for the currently
visible context).

* Also added support for showing Grease Pencil keyframes in the timeline,
though this doesn't currently work because of context issues. We need to find
a way around not being able to know what other views are showing GP data
(e.g. maybe default to only showing stuff for 3D views, since that's the primary
usecase for animation-type work)?

low res: errors in grid construction fixed, methods for passing obstacles to Mantaflow added

Added back toggle in Clip Editor to set where the datablock gets attached