diff options
| author | Rémi Verschelde | 2016-03-10 16:15:49 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-03-10 16:15:49 +0100 |
| commit | aaad24e6fb1528fc6c773c0225ed9500c3fdd2bb (patch) | |
| tree | 050800bfb1afbc562448967ee635834356c43af5 /tools/editor/plugins | |
| parent | 042f8bf88c331197b05e9b250b48ef3f5632b4fe (diff) | |
| parent | 7b07bcaf449ea6cf52c2ac501e48cddbe4bde035 (diff) | |
| download | godot-aaad24e6fb1528fc6c773c0225ed9500c3fdd2bb.tar.gz godot-aaad24e6fb1528fc6c773c0225ed9500c3fdd2bb.tar.zst godot-aaad24e6fb1528fc6c773c0225ed9500c3fdd2bb.zip | |
Merge pull request #3865 from Marqin/coverity
[Coverity] fixed 11 of 537 potential bugs found by Coverity
Diffstat (limited to '')
| -rw-r--r-- | tools/editor/plugins/editor_preview_plugins.cpp | 6 | ||||
| -rw-r--r-- | tools/editor/plugins/script_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/tools/editor/plugins/editor_preview_plugins.cpp b/tools/editor/plugins/editor_preview_plugins.cpp index f3b527257..12d50cd4b 100644 --- a/tools/editor/plugins/editor_preview_plugins.cpp +++ b/tools/editor/plugins/editor_preview_plugins.cpp @@ -725,7 +725,11 @@ Ref<Texture> EditorSamplePreviewPlugin::generate(const RES& p_from) { } else { half=1; ofs=h/2; - v = ((j-(h/2))/(float)(h/2)) * 2.0 - 1.0; + if( (float)(h/2) != 0 ) { + v = ((j-(h/2))/(float)(h/2)) * 2.0 - 1.0; + } else { + v = ((j-(h/2))/(float)(1/2)) * 2.0 - 1.0; + } } uint8_t* imgofs = &imgw[(j*w+i)*3]; diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 2fb5dd619..76c64beb6 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -1784,7 +1784,8 @@ void ScriptEditor::_update_script_colors() { if (h>hist_size) { continue; } - float v = Math::ease((edit_pass-pass)/float(hist_size),0.4); + int non_zero_hist_size = ( hist_size == 0 ) ? 1 : hist_size; + float v = Math::ease((edit_pass-pass)/float(non_zero_hist_size),0.4); script_list->set_item_custom_bg_color(i,hot_color.linear_interpolate(cold_color,v)); @@ -2704,4 +2705,3 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) { ScriptEditorPlugin::~ScriptEditorPlugin() { } - diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index e787c7470..79ff78ca0 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -2084,7 +2084,9 @@ void SpatialEditorViewport::_menu_option(int p_option) { count++; } - center/=float(count); + if( count != 0 ) { + center/=float(count); + } cursor.pos=center; } break; @@ -4240,6 +4242,3 @@ SpatialEditorPlugin::SpatialEditorPlugin(EditorNode *p_node) { SpatialEditorPlugin::~SpatialEditorPlugin() { } - - - |