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

[Antony Riakiotakis]

Commit: f74e4d9dfefdaa04c489adf6d31037c43d195faa
Author: Antony Riakiotakis
Date:   Fri Nov 28 16:21:45 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBf74e4d9dfefdaa04c489adf6d31037c43d195faa

Merge branch 'viewport_experiments' into gooseberry

Conflicts:
	source/blender/gpu/intern/gpu_buffers.c

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



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