Merge remote-tracking branch 'bpay/clang-cl-build-fixes' into development

Conflicts:
	Engine/source/T3D/shapeBase.h
This commit is contained in:
Daniel Buckmaster 2015-07-17 16:55:12 +10:00
commit c2e5dc3345
17 changed files with 40 additions and 27 deletions

View file

@ -30,7 +30,7 @@
#ifndef _SCENEPOLYHEDRALOBJECT_H_
#include "scene/mixin/scenePolyhedralObject.h"
#endif
#include "scene/mixin/scenePolyhedralObject.impl.h"
///
class ScenePolyhedralSpace : public ScenePolyhedralObject< SceneSpace >