From 7de9c252144536331462f1e56014e1cd2d5c76cb Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 9 Apr 2020 12:36:18 +0200 Subject: [PATCH] Fix build for 4.0. --- plugin_collada/editor_import_collada_mdr.h | 11 ++++++++++- plugin_gltf/editor_import_gltf_mdr.h | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/plugin_collada/editor_import_collada_mdr.h b/plugin_collada/editor_import_collada_mdr.h index f464bea..0abaf79 100644 --- a/plugin_collada/editor_import_collada_mdr.h +++ b/plugin_collada/editor_import_collada_mdr.h @@ -29,13 +29,22 @@ SOFTWARE. #include "core/math/transform.h" #include "core/ustring.h" #include "editor/import/editor_import_plugin.h" -#include "scene/3d/mesh_instance.h" #include "scene/main/node.h" #include "scene/resources/mesh.h" #include "../mesh_data_resource.h" #include "editor/import/editor_import_collada.h" +#include "core/version.h" + +#if VERSION_MAJOR < 4 +#include "scene/3d/mesh_instance.h" +#else +#include "scene/3d/mesh_instance_3d.h" + +#define MeshInstance MeshInstance3D +#endif + class EditorImportColladaMdr : public EditorImportPlugin { GDCLASS(EditorImportColladaMdr, EditorImportPlugin); diff --git a/plugin_gltf/editor_import_gltf_mdr.h b/plugin_gltf/editor_import_gltf_mdr.h index d213c71..2323a7d 100644 --- a/plugin_gltf/editor_import_gltf_mdr.h +++ b/plugin_gltf/editor_import_gltf_mdr.h @@ -29,13 +29,22 @@ SOFTWARE. #include "core/math/transform.h" #include "core/ustring.h" #include "editor/import/editor_import_plugin.h" -#include "scene/3d/mesh_instance.h" #include "scene/main/node.h" #include "scene/resources/mesh.h" #include "../mesh_data_resource.h" #include "editor/import/editor_scene_importer_gltf.h" +#include "core/version.h" + +#if VERSION_MAJOR < 4 +#include "scene/3d/mesh_instance.h" +#else +#include "scene/3d/mesh_instance_3d.h" + +#define MeshInstance MeshInstance3D +#endif + class EditorImportGLTFMdr : public EditorImportPlugin { GDCLASS(EditorImportGLTFMdr, EditorImportPlugin);