Merge branch 'development' into Xenon_Removal

This commit is contained in:
Areloch 2017-04-18 20:47:43 -05:00 committed by GitHub
commit c443e7a4ae
124 changed files with 663 additions and 653 deletions

View file

@ -47,7 +47,7 @@
#include "materials/sceneData.h"
#include "materials/materialFeatureTypes.h"
#include "materials/matInstance.h"
#include "renderInstance/renderPrePassMgr.h"
#include "renderInstance/renderDeferredMgr.h"
#include "console/engineAPI.h"
/// This is used for rendering ground cover billboards.