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 /servers/visual | |
| 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 'servers/visual')
| -rw-r--r-- | servers/visual/rasterizer.h | 10 | ||||
| -rw-r--r-- | servers/visual/visual_server_raster.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 81862fb3a..79365f7db 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -863,17 +863,17 @@ public: if (polygon->indices != NULL) { r.pos=polygon->points[polygon->indices[0]]; - for (int i=1; i<polygon->count; i++) { + for (int i=1; i<l; i++) { r.expand_to(polygon->points[polygon->indices[i]]); - }; + } } else { r.pos=polygon->points[0]; - for (int i=1; i<polygon->count; i++) { + for (int i=1; i<l; i++) { r.expand_to(polygon->points[i]); - }; - }; + } + } } break; case CanvasItem::Command::TYPE_CIRCLE: { diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index 6556f8bc4..a547da9b6 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -7281,7 +7281,7 @@ void VisualServerRaster::_draw_viewports() { if (r.size.width==0) r.size.width=window_w; if (r.size.height==0) - r.size.height=window_w; + r.size.height=window_h; _draw_viewport(vp,r.pos.x,r.pos.y,r.size.width,r.size.height); |