From 201275b4ae50dab90e1a7ec32f4b06ef484ee888 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 12 Apr 2015 23:28:12 +0200 Subject: [PATCH] (NodeComponent) Fixed NzNode::SetParent methods not being exposed Former-commit-id: e4c60f01db90cd288314c37bfb6969b1922a1868 --- SDK/include/NDK/Components/NodeComponent.hpp | 1 + SDK/include/NDK/Components/NodeComponent.inl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SDK/include/NDK/Components/NodeComponent.hpp b/SDK/include/NDK/Components/NodeComponent.hpp index 804acc2c0..c52f0ed88 100644 --- a/SDK/include/NDK/Components/NodeComponent.hpp +++ b/SDK/include/NDK/Components/NodeComponent.hpp @@ -21,6 +21,7 @@ namespace Ndk ~NodeComponent() = default; void SetParent(Entity* entity, bool keepDerived = false); + using NzNode::SetParent; static ComponentIndex componentIndex; }; diff --git a/SDK/include/NDK/Components/NodeComponent.inl b/SDK/include/NDK/Components/NodeComponent.inl index f7b01b687..ac41cf982 100644 --- a/SDK/include/NDK/Components/NodeComponent.inl +++ b/SDK/include/NDK/Components/NodeComponent.inl @@ -16,6 +16,6 @@ namespace Ndk NzNode::SetParent(entity->GetComponent(), keepDerived); } else - SetParent(nullptr, keepDerived); + NzNode::SetParent(nullptr, keepDerived); } }