6 files changed, 14 insertions, 5 deletions
diff --git a/core/os/os.h b/core/os/os.h
index 30cfb32b89..ebfe7d20dc 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -518,7 +518,7 @@ public:
 	bool is_restart_on_exit_set() const;
 	List<String> get_restart_on_exit_arguments() const;
 
-	virtual void process_and_drop_events() { }
+	virtual void process_and_drop_events() {}
 	OS();
 	virtual ~OS();
 };
diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl
index e3c6966e21..3b0bca982d 100644
--- a/drivers/gles2/shaders/scene.glsl
+++ b/drivers/gles2/shaders/scene.glsl
@@ -415,7 +415,6 @@ void main() {
 		world_matrix = world_matrix * bone_transform;
 	}
 
-
 #endif
 
 #ifdef USE_INSTANCING
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 5be08410a1..687bf40cdd 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -3057,7 +3057,6 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
 				}
 
 				DataType iter_type;
-				iter_type.is_constant = true;
 
 				if (container->type == Node::TYPE_OPERATOR) {
 
@@ -5445,7 +5444,7 @@ GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source,
 				String script_path = ScriptServer::get_global_class_path(id);
 				if (script_path == self_path) {
 					result.kind = DataType::CLASS;
-					result.class_type = current_class;
+					result.class_type = static_cast<ClassNode *>(head);
 				} else {
 					Ref<Script> script = ResourceLoader::load(script_path);
 					Ref<GDScript> gds = script;
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index a2f266f995..027a4e76f6 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -2580,7 +2580,6 @@ void OS_OSX::force_process_input() {
 
 	process_events(); // get rid of pending events
 	joypad_osx->process_joypads();
-
 }
 
 void OS_OSX::run() {
diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp
index 5b08ea7790..c491275f00 100644
--- a/scene/3d/gi_probe.cpp
+++ b/scene/3d/gi_probe.cpp
@@ -30,6 +30,8 @@
 
 #include "gi_probe.h"
 
+#include "core/os/os.h"
+
 #include "mesh_instance.h"
 #include "voxel_light_baker.h"
 
@@ -490,6 +492,14 @@ PoolVector<Face3> GIProbe::get_faces(uint32_t p_usage_flags) const {
 	return PoolVector<Face3>();
 }
 
+String GIProbe::get_configuration_warning() const {
+
+	if (OS::get_singleton()->get_current_video_driver() == OS::VIDEO_DRIVER_GLES2) {
+		return TTR("GIProbes are not supported by the GLES2 video driver.\nUse a BakedLightmap instead.");
+	}
+	return String();
+}
+
 void GIProbe::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_probe_data", "data"), &GIProbe::set_probe_data);
diff --git a/scene/3d/gi_probe.h b/scene/3d/gi_probe.h
index 87664e06b8..4badabbadf 100644
--- a/scene/3d/gi_probe.h
+++ b/scene/3d/gi_probe.h
@@ -168,6 +168,8 @@ public:
 	virtual AABB get_aabb() const;
 	virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const;
 
+	virtual String get_configuration_warning() const;
+
 	GIProbe();
 	~GIProbe();
 };