Merge branch 'master' into reflection-mapping

This commit is contained in:
Lynix
2017-10-02 21:11:15 +02:00
518 changed files with 6740 additions and 2355 deletions

View File

@@ -7,7 +7,6 @@
#ifndef NAZARA_INSTANCEDRENDERABLE_HPP
#define NAZARA_INSTANCEDRENDERABLE_HPP
#include <Nazara/Core/PrimitiveList.hpp>
#include <Nazara/Core/ObjectLibrary.hpp>
#include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp>