Blender Git Loki

Merge branch 'master' into soc-2014-shapekey

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.

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

Merge branch 'master' into soc-2014-shapekey

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

Restore double-up/down arrows icons.

Merge branch 'master' into soc-2014-shapekey

Conflicts:
release/datafiles/blender_icons.svg
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_shapekey.c

Note about blender_icons.svg: blindly reset to master state, hard to do otherwise on such file... :/

Fixed compilation under MSVC

Cleanup of gcc warnings.

Fix compilation after merge.

Merge branch 'master' into soc-2014-shapekey

Conflicts:
source/blender/editors/object/object_shapekey.c

Better naming for compressed keyblock vertices-related stuff

(No 'real' changes)

Merge remote-tracking branch 'origin' into soc

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Another iteration for Modal Blend From Shape

Fixed a crash in Blend From Shape involving boundboxes

Double triangle icons for Shape Key Move

Shape Key Move now has proper icons for moving the shape keys to top or bottom of the list