diff options
| author | Juan Linietsky | 2015-05-09 13:09:20 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-05-09 13:09:20 -0300 |
| commit | 1fd1b7a91b2f60a2841b9684e1e41728275cedaf (patch) | |
| tree | 17678512dde4890e941c78ba90ba23b184e2ae9a /tools/editor/plugins | |
| parent | 1a7d370fcf7382a9e248925a7eef12d28e0bb9e3 (diff) | |
| parent | 158785636c809d5ebdb6995a088c7776ce45e65c (diff) | |
| download | godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.tar.gz godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.tar.zst godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
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++) { |