From 3acbf8e71f15c682bcf4fee248f58180e689df1c Mon Sep 17 00:00:00 2001
From: eska
Date: Sun, 5 Jun 2016 14:52:07 +0200
Subject: Fix implicit GDScript Reference inheritance

---
 modules/gdscript/gd_script.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'modules/gdscript/gd_script.cpp')

diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index dcd0641f7..12fc36d8c 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -145,11 +145,8 @@ Variant GDScript::_new(const Variant** p_args,int p_argcount,Variant::CallError&
 		_baseptr=_baseptr->_base;
 	}
 
-	if (_baseptr->native.ptr()) {
-		owner=_baseptr->native->instance();
-	} else {
-		owner=memnew( Reference ); //by default, no base means use reference
-	}
+	ERR_FAIL_COND_V(_baseptr->native.is_null(), Variant());
+	owner=_baseptr->native->instance();
 
 	Reference *r=owner->cast_to<Reference>();
 	if (r) {
-- 
cgit v1.2.3-70-g09d2