Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color

Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp

5 files changed, 7 insertions, 9 deletions

diff --git a/modules/SCsub b/modules/SCsub
index d215f72c0..9215bfd48 100644
--- a/modules/SCsub
+++ b/modules/SCsub
@@ -19,5 +19,3 @@ for x in env.module_list:
 lib = env_modules.Library("modules",env.modules_sources)

 

 env.Prepend(LIBS=[lib])

-

-

diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub
index d20da72b7..403fe68f6 100644
--- a/modules/gdscript/SCsub
+++ b/modules/gdscript/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.modules_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index 313fb57d0..202ab76da 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -1940,9 +1940,15 @@ void GDParser::_parse_extends(ClassNode *p_class) {
 
 	p_class->extends_used=true;
 
-	//see if inheritance happens from a file
 	tokenizer->advance();
 
+	if (tokenizer->get_token()==GDTokenizer::TK_BUILT_IN_TYPE && tokenizer->get_token_type()==Variant::OBJECT) {
+		p_class->extends_class.push_back(Variant::get_type_name(Variant::OBJECT));
+		tokenizer->advance();
+		return;
+	}
+
+	// see if inheritance happens from a file
 	if (tokenizer->get_token()==GDTokenizer::TK_CONSTANT) {
 
 		Variant constant = tokenizer->get_token_constant();
diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h
index 134279b6d..04f3dff3d 100644
--- a/modules/gdscript/gd_parser.h
+++ b/modules/gdscript/gd_parser.h
@@ -276,7 +276,6 @@ public:
 	};
 
 	struct NewLineNode : public Node {
-		int line;
 		NewLineNode() { type=TYPE_NEWLINE; }
 	};
 
diff --git a/modules/gridmap/SCsub b/modules/gridmap/SCsub
index 4cb47e7e6..211a04346 100644
--- a/modules/gridmap/SCsub
+++ b/modules/gridmap/SCsub
@@ -1,6 +1,3 @@
 Import('env')
 
 env.add_source_files(env.modules_sources,"*.cpp")
-
-
-