[Bf-blender-cvs] [0ef5c18] soc-2014-viewport_fx: Merge branch 'soc-2014-viewport_fx' of git.blender.org:blender into soc-2014-viewport_fx

[Jason Wilkins]

Commit: 0ef5c183d8bbaff0eefe8f91b6710002405bbcdc
Author: Jason Wilkins
Date:   Wed Jul 9 21:30:31 2014 -0500
https://developer.blender.org/rB0ef5c183d8bbaff0eefe8f91b6710002405bbcdc

Merge branch 'soc-2014-viewport_fx' of git.blender.org:blender into soc-2014-viewport_fx

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



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