Browse Source

Merge pull request #23793 from Rubonnek/remove-unnecessary-assignments

Removed unnecessary assignments
Rémi Verschelde 6 years ago
parent
commit
ede4decd4e

+ 0 - 3
drivers/gles2/rasterizer_scene_gles2.cpp

@@ -605,7 +605,6 @@ bool RasterizerSceneGLES2::reflection_probe_instance_postprocess_step(RID p_inst
 
 	size >>= 1;
 	int mipmaps = 6;
-	int mm_level = mipmaps - 1;
 
 	storage->shaders.cubemap_filter.set_conditional(CubemapFilterShaderGLES2::USE_SOURCE_PANORAMA, false);
 	storage->shaders.cubemap_filter.bind();
@@ -628,8 +627,6 @@ bool RasterizerSceneGLES2::reflection_probe_instance_postprocess_step(RID p_inst
 
 		size >>= 1;
 
-		mm_level--;
-
 		lod++;
 	}
 

+ 0 - 6
drivers/gles3/shader_gles3.cpp

@@ -219,20 +219,15 @@ ShaderGLES3::Version *ShaderGLES3::get_current_version() {
 	strings.push_back("#version 300 es\n");
 #endif
 
-	int define_line_ofs = 1;
-
 	for (int i = 0; i < custom_defines.size(); i++) {
 
 		strings.push_back(custom_defines[i].get_data());
-		define_line_ofs++;
 	}
 
 	for (int j = 0; j < conditional_count; j++) {
 
 		bool enable = ((1 << j) & conditional_version.version);
 		strings.push_back(enable ? conditional_defines[j] : "");
-		if (enable)
-			define_line_ofs++;
 
 		if (enable) {
 			DEBUG_PRINT(conditional_defines[j]);
@@ -253,7 +248,6 @@ ShaderGLES3::Version *ShaderGLES3::get_current_version() {
 		ERR_FAIL_COND_V(!custom_code_map.has(conditional_version.code_version), NULL);
 		cc = &custom_code_map[conditional_version.code_version];
 		v.code_version = cc->version;
-		define_line_ofs += 2;
 	}
 
 	/* CREATE PROGRAM */

+ 0 - 2
editor/editor_about.cpp

@@ -209,7 +209,6 @@ EditorAbout::EditorAbout() {
 	TreeItem *tpl_ti_lc = _tpl_tree->create_item(root);
 	tpl_ti_lc->set_text(0, TTR("Licenses"));
 	tpl_ti_lc->set_selectable(0, false);
-	int read_idx = 0;
 	String long_text = "";
 	for (int component_index = 0; component_index < COPYRIGHT_INFO_COUNT; component_index++) {
 
@@ -234,7 +233,6 @@ EditorAbout::EditorAbout() {
 			String license = "\n    License: " + String(part.license) + "\n";
 			text += license;
 			long_text += license + "\n";
-			read_idx++;
 		}
 		ti->set_metadata(0, text);
 	}