5 files changed, 58 insertions, 36 deletions

diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp
index 4cbf6f2de3..cf0317cd58 100644
--- a/scene/3d/mesh_instance.cpp
+++ b/scene/3d/mesh_instance.cpp
@@ -253,6 +253,11 @@ void MeshInstance::_notification(int p_what) {
 	}
 }
 
+int MeshInstance::get_surface_material_count() const {
+
+	return materials.size();
+}
+
 void MeshInstance::set_surface_material(int p_surface, const Ref<Material> &p_material) {
 
 	ERR_FAIL_INDEX(p_surface, materials.size());
@@ -359,6 +364,7 @@ void MeshInstance::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_skeleton_path", "skeleton_path"), &MeshInstance::set_skeleton_path);
 	ClassDB::bind_method(D_METHOD("get_skeleton_path"), &MeshInstance::get_skeleton_path);
 
+	ClassDB::bind_method(D_METHOD("get_surface_material_count"), &MeshInstance::get_surface_material_count);
 	ClassDB::bind_method(D_METHOD("set_surface_material", "surface", "material"), &MeshInstance::set_surface_material);
 	ClassDB::bind_method(D_METHOD("get_surface_material", "surface"), &MeshInstance::get_surface_material);
 
diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h
index 0dfec538f9..0b5b4b9e7b 100644
--- a/scene/3d/mesh_instance.h
+++ b/scene/3d/mesh_instance.h
@@ -76,6 +76,7 @@ public:
 	void set_skeleton_path(const NodePath &p_skeleton);
 	NodePath get_skeleton_path();
 
+	int get_surface_material_count() const;
 	void set_surface_material(int p_surface, const Ref<Material> &p_material);
 	Ref<Material> get_surface_material(int p_surface) const;
 
diff --git a/scene/gui/gradient_edit.cpp b/scene/gui/gradient_edit.cpp
index 934b84ec0c..c13964d196 100644
--- a/scene/gui/gradient_edit.cpp
+++ b/scene/gui/gradient_edit.cpp
@@ -236,8 +236,8 @@ void GradientEdit::_gui_input(const Ref<InputEvent> &p_event) {
 
 		//Snap to nearest point if holding shift
 		if (mm->get_shift()) {
-			float snap_treshhold = 0.03;
-			float smallest_ofs = snap_treshhold;
+			float snap_threshold = 0.03;
+			float smallest_ofs = snap_threshold;
 			bool found = false;
 			int nearest_point = 0;
 			for (int i = 0; i < points.size(); ++i) {
diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp
index c56b7d0f26..b7f8c74046 100644
--- a/scene/gui/tabs.cpp
+++ b/scene/gui/tabs.cpp
@@ -106,41 +106,8 @@ void Tabs::_gui_input(const Ref<InputEvent> &p_event) {
 			}
 		}
 
-		// test hovering to display right or close button
-		int hover_now = -1;
-		int hover_buttons = -1;
-		for (int i = 0; i < tabs.size(); i++) {
-
-			if (i < offset)
-				continue;
-
-			Rect2 rect = get_tab_rect(i);
-			if (rect.has_point(pos)) {
-				hover_now = i;
-			}
-			if (tabs[i].rb_rect.has_point(pos)) {
-				rb_hover = i;
-				cb_hover = -1;
-				hover_buttons = i;
-				break;
-			} else if (!tabs[i].disabled && tabs[i].cb_rect.has_point(pos)) {
-				cb_hover = i;
-				rb_hover = -1;
-				hover_buttons = i;
-				break;
-			}
-		}
-		if (hover != hover_now) {
-			hover = hover_now;
-			emit_signal("tab_hover", hover);
-		}
-
-		if (hover_buttons == -1) { // no hover
-			rb_hover = hover_buttons;
-			cb_hover = hover_buttons;
-		}
+		_update_hover();
 		update();
-
 		return;
 	}
 
@@ -522,6 +489,48 @@ Ref<Texture> Tabs::get_tab_right_button(int p_tab) const {
 	return tabs[p_tab].right_button;
 }
 
+void Tabs::_update_hover() {
+
+	if (!is_inside_tree()) {
+		return;
+	}
+
+	const Point2 &pos = get_local_mouse_position();
+	// test hovering to display right or close button
+	int hover_now = -1;
+	int hover_buttons = -1;
+	for (int i = 0; i < tabs.size(); i++) {
+
+		if (i < offset)
+			continue;
+
+		Rect2 rect = get_tab_rect(i);
+		if (rect.has_point(pos)) {
+			hover_now = i;
+		}
+		if (tabs[i].rb_rect.has_point(pos)) {
+			rb_hover = i;
+			cb_hover = -1;
+			hover_buttons = i;
+			break;
+		} else if (!tabs[i].disabled && tabs[i].cb_rect.has_point(pos)) {
+			cb_hover = i;
+			rb_hover = -1;
+			hover_buttons = i;
+			break;
+		}
+	}
+	if (hover != hover_now) {
+		hover = hover_now;
+		emit_signal("tab_hover", hover);
+	}
+
+	if (hover_buttons == -1) { // no hover
+		rb_hover = hover_buttons;
+		cb_hover = hover_buttons;
+	}
+}
+
 void Tabs::_update_cache() {
 	Ref<StyleBox> tab_disabled = get_stylebox("tab_disabled");
 	Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
@@ -597,6 +606,7 @@ void Tabs::add_tab(const String &p_str, const Ref<Texture> &p_icon) {
 
 	tabs.push_back(t);
 	_update_cache();
+	call_deferred("_update_hover");
 	update();
 	minimum_size_changed();
 }
@@ -604,6 +614,7 @@ void Tabs::add_tab(const String &p_str, const Ref<Texture> &p_icon) {
 void Tabs::clear_tabs() {
 	tabs.clear();
 	current = 0;
+	call_deferred("_update_hover");
 	update();
 }
 
@@ -614,6 +625,7 @@ void Tabs::remove_tab(int p_idx) {
 	if (current >= p_idx)
 		current--;
 	_update_cache();
+	call_deferred("_update_hover");
 	update();
 	minimum_size_changed();
 
@@ -931,6 +943,7 @@ bool Tabs::get_select_with_rmb() const {
 void Tabs::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("_gui_input"), &Tabs::_gui_input);
+	ClassDB::bind_method(D_METHOD("_update_hover"), &Tabs::_update_hover);
 	ClassDB::bind_method(D_METHOD("get_tab_count"), &Tabs::get_tab_count);
 	ClassDB::bind_method(D_METHOD("set_current_tab", "tab_idx"), &Tabs::set_current_tab);
 	ClassDB::bind_method(D_METHOD("get_current_tab"), &Tabs::get_current_tab);
diff --git a/scene/gui/tabs.h b/scene/gui/tabs.h
index e204f4364b..a98744b804 100644
--- a/scene/gui/tabs.h
+++ b/scene/gui/tabs.h
@@ -97,6 +97,8 @@ private:
 
 	int get_tab_width(int p_idx) const;
 	void _ensure_no_over_offset();
+
+	void _update_hover();
 	void _update_cache();
 
 protected: