diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-18 08:15:03 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 10:18:35 +0000 |
| commit | 96d504427e94bb45427a8afb0adbc44d64573ca9 (patch) | |
| tree | 1c3b1d5ec79fb84431b21a11873ccae6dded715c /src/render/backend/managers_p.h | |
| parent | 7e090adf359aea25722b62e2e4f604af0fa78bf5 (diff) | |
Rename RenderMaterial -> Material
Change-Id: I4fed4482fe3620caed638f36a054db374a8e8942
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/managers_p.h')
| -rw-r--r-- | src/render/backend/managers_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index d81398b8d..27676f879 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -44,7 +44,7 @@ #include <Qt3DRenderer/private/effect_p.h> #include <Qt3DRenderer/private/entity_p.h> #include <Qt3DRenderer/private/layer_p.h> -#include <Qt3DRenderer/private/rendermaterial_p.h> +#include <Qt3DRenderer/private/material_p.h> #include <Qt3DRenderer/private/rendershader_p.h> #include <Qt3DRenderer/private/sortcriterion_p.h> #include <Qt3DRenderer/private/rendertechnique_p.h> @@ -138,7 +138,7 @@ public: }; class MaterialManager : public Qt3D::QResourceManager< - RenderMaterial, + Material, Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, @@ -306,7 +306,7 @@ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Annotation, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Effect, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Entity, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Layer, Q_REQUIRES_CLEANUP) -Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderMaterial, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Material, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderShader, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::SortCriterion, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTarget, Q_REQUIRES_CLEANUP) |