godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Removed unnecessary assignments
This commit is contained in:
Rémi Verschelde 2018-11-18 11:25:21 +01:00 committed by GitHub
parent fafece44a2 f8e0051420
commit ede4decd4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gles2/rasterizer_scene_gles2.cpp
View File

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

6
drivers/gles3/shader_gles3.cpp
View File

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

2
editor/editor_about.cpp
View File

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