[Bf-blender-cvs] [46b787b] gooseberry: Merge branch 'viewport_experiments' into gooseberry

[Antony Riakiotakis]

Commit: 46b787bd6ece1a8bd7c466a72bbd6473b0549fc1
Author: Antony Riakiotakis
Date:   Tue Nov 4 11:12:08 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB46b787bd6ece1a8bd7c466a72bbd6473b0549fc1

Merge branch 'viewport_experiments' into gooseberry

Conflicts:
	source/blender/makesdna/DNA_view3d_types.h

===================================================================



===================================================================