merged gdnative and nativescript module

1 files changed, 9 insertions, 0 deletions

diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp
index 9ad05b7194..a63bf0c0a9 100644
--- a/modules/gdnative/register_types.cpp
+++ b/modules/gdnative/register_types.cpp
@@ -28,11 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "register_types.h"
+#include "gdnative/gdnative.h"
+
 #include "gdnative.h"
 
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
 
+#include "nativescript/register_types.h"
+
 #include "core/os/os.h"
 
 godot_variant cb_standard_varcall(void *handle, godot_string *p_procedure, godot_array *p_args) {
@@ -72,9 +76,14 @@ void register_gdnative_types() {
 	GDNativeCallRegistry::singleton = memnew(GDNativeCallRegistry);
 
 	GDNativeCallRegistry::singleton->register_native_call_type("standard_varcall", cb_standard_varcall);
+
+	register_nativescript_types();
 }
 
 void unregister_gdnative_types() {
+
+	unregister_nativescript_types();
+
 	memdelete(GDNativeCallRegistry::singleton);
 
 	// This is for printing out the sizes of the core types