Fix style issues and signature mismatch

drivers/gles2/shaders/scene.glsl

@@ -84,8 +84,6 @@ uniform highp mat4 world_transform;
 
 uniform highp float time;
 
-
-
 #ifdef RENDER_DEPTH
 uniform float light_bias;
 uniform float light_normal_bias;

drivers/gles3/shaders/canvas.glsl

@@ -477,7 +477,7 @@ void main() {
 
 #if defined(NORMALMAP_USED)
 		vec3 normal_map = vec3(0.0, 0.0, 1.0);
-		normal_used=true;
+		normal_used = true;
 #endif
 
 		/* clang-format off */

drivers/gles3/shaders/effect_blur.glsl

@@ -272,7 +272,7 @@ void main() {
 	float luminance = max(frag_color.r, max(frag_color.g, frag_color.b));
 	float feedback = max(smoothstep(glow_hdr_threshold, glow_hdr_threshold + glow_hdr_scale, luminance), glow_bloom);
 
-	frag_color = min( frag_color * feedback, vec4(luminance_cap) );
+	frag_color = min(frag_color * feedback, vec4(luminance_cap));
 
 #endif
 

drivers/gles3/shaders/scene.glsl

@@ -1590,8 +1590,8 @@ void main() {
 #endif
 
 #if defined(ENABLE_TANGENT_INTERP) || defined(ENABLE_NORMALMAP) || defined(LIGHT_USE_ANISOTROPY)
-	vec3 binormal = normalize(binormal_interp);// * side;
+	vec3 binormal = normalize(binormal_interp);
-	vec3 tangent = normalize(tangent_interp);// * side;
+	vec3 tangent = normalize(tangent_interp);
 #else
 	vec3 binormal = vec3(0.0);
 	vec3 tangent = vec3(0.0);

editor/editor_folding.cpp

@@ -1,8 +1,8 @@
 #include "editor_folding.h"
 
 #include "core/os/file_access.h"
-#include "editor_settings.h"
 #include "editor_inspector.h"
+#include "editor_settings.h"
 
 PoolVector<String> EditorFolding::_get_unfolds(const Object *p_object) {
 
@@ -172,7 +172,6 @@ bool EditorFolding::has_folding_data(const String &p_path) {
 	return FileAccess::exists(file);
 }
 
-
 void EditorFolding::_do_object_unfolds(Object *p_object, Set<RES> &resources) {
 
 	List<PropertyInfo> plist;
@@ -185,34 +184,33 @@ void EditorFolding::_do_object_unfolds(Object *p_object, Set<RES> &resources) {
 	for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
 
 		if (E->get().usage & PROPERTY_USAGE_CATEGORY) {
-			group="";
+			group = "";
-			group_base="";
+			group_base = "";
 		}
 		if (E->get().usage & PROPERTY_USAGE_GROUP) {
 			group = E->get().name;
 			group_base = E->get().hint_string;
 			if (group_base.ends_with("_")) {
-				group_base=group_base.substr(0,group_base.length()-1);
+				group_base = group_base.substr(0, group_base.length() - 1);
 			}
 		}
 
 		//can unfold
 		if (E->get().usage & PROPERTY_USAGE_EDITOR) {
 
-
 			if (group != "") { //group
-				if (group_base==String() || E->get().name.begins_with(group_base)) {
+				if (group_base == String() || E->get().name.begins_with(group_base)) {
-					bool can_revert = EditorPropertyRevert::can_property_revert(p_object,E->get().name);
+					bool can_revert = EditorPropertyRevert::can_property_revert(p_object, E->get().name);
-					if (can_revert)	{
+					if (can_revert) {
 						unfold_group.insert(group);
 					}
 				}
 			} else { //path
 				int last = E->get().name.find_last("/");
-				if (last!=-1) {
+				if (last != -1) {
-					bool can_revert = EditorPropertyRevert::can_property_revert(p_object,E->get().name);
+					bool can_revert = EditorPropertyRevert::can_property_revert(p_object, E->get().name);
 					if (can_revert) {
-						unfold_group.insert(E->get().name.substr(0,last));
+						unfold_group.insert(E->get().name.substr(0, last));
 					}
 				}
 			}
@@ -223,13 +221,13 @@ void EditorFolding::_do_object_unfolds(Object *p_object, Set<RES> &resources) {
 			if (res.is_valid() && !resources.has(res) && res->get_path() != String() && !res->get_path().is_resource_file()) {
 
 				resources.insert(res);
-				_do_object_unfolds(res.ptr(),resources);
+				_do_object_unfolds(res.ptr(), resources);
 			}
 		}
 	}
 
-	for (Set<String>::Element *E=unfold_group.front();E;E=E->next()) {
+	for (Set<String>::Element *E = unfold_group.front(); E; E = E->next()) {
-	     p_object->editor_set_section_unfold(E->get(),true);
+		p_object->editor_set_section_unfold(E->get(), true);
 	}
 }
 
@@ -243,7 +241,7 @@ void EditorFolding::_do_node_unfolds(Node *p_root, Node *p_node, Set<RES> &resou
 		}
 	}
 
-	_do_object_unfolds(p_node,resources);
+	_do_object_unfolds(p_node, resources);
 
 	for (int i = 0; i < p_node->get_child_count(); i++) {
 		_do_node_unfolds(p_root, p_node->get_child(i), resources);
@@ -253,7 +251,7 @@ void EditorFolding::_do_node_unfolds(Node *p_root, Node *p_node, Set<RES> &resou
 void EditorFolding::unfold_scene(Node *p_scene) {
 
 	Set<RES> resources;
-	_do_node_unfolds(p_scene,p_scene,resources);
+	_do_node_unfolds(p_scene, p_scene, resources);
 }
 
 EditorFolding::EditorFolding() {

scene/resources/environment.cpp

@@ -585,9 +585,9 @@ float Environment::get_glow_hdr_bleed_threshold() const {
 	return glow_hdr_bleed_threshold;
 }
 
-void Environment::set_glow_hdr_luminance_cap(float p_threshold) {
+void Environment::set_glow_hdr_luminance_cap(float p_amount) {
 
-	glow_hdr_luminance_cap = p_threshold;
+	glow_hdr_luminance_cap = p_amount;
 
 	VS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_bloom, VS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
 }