diff options
| author | Juan Linietsky | 2015-05-07 20:02:54 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-05-07 20:02:54 -0300 |
| commit | c99813dc38cc79b37529cdd98dc2bc2c3ff69edc (patch) | |
| tree | 99ea11d3829bf296ea23941a83ebc61158028087 /tools/editor/plugins | |
| parent | 7156aff16041ea56ff1f3aea2a622c130bcca7a9 (diff) | |
| parent | ac9263c680076eed36887a681cb59fdcce6c6f73 (diff) | |
| download | godot-c99813dc38cc79b37529cdd98dc2bc2c3ff69edc.tar.gz godot-c99813dc38cc79b37529cdd98dc2bc2c3ff69edc.tar.zst godot-c99813dc38cc79b37529cdd98dc2bc2c3ff69edc.zip | |
Merge pull request #1826 from eehrich/master
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
Diffstat (limited to 'tools/editor/plugins')
| -rw-r--r-- | tools/editor/plugins/shader_graph_editor_plugin.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index 1db901e56..03fcbffa2 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -539,7 +539,6 @@ void GraphCurveMapEdit::_plot_curve(const Vector2& p_a,const Vector2& p_b,const if ((lastx != newx) || (lasty != newy)) { #if 0 - /* if(fix255) { /* use fixed array size (for the curve graph) */ diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 4dae60399..ac2ea9799 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -3172,11 +3172,11 @@ void SpatialEditor::_init_indicators() { int arrow_sides=6; - for(int i = 0; i < 7 ; i++) { + for(int k = 0; k < 7 ; k++) { - Matrix3 ma(ivec,Math_PI*2*float(i)/arrow_sides); - Matrix3 mb(ivec,Math_PI*2*float(i+1)/arrow_sides); + Matrix3 ma(ivec,Math_PI*2*float(k)/arrow_sides); + Matrix3 mb(ivec,Math_PI*2*float(k+1)/arrow_sides); for(int j=0;j<arrow_points-1;j++) { |