godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Merge pull request #17637 from robfram/fix-draw_polyline_colors-crash

Browse Source 
Fix crash in `canvas_item_add_polyline` when passing more points than colors
This commit is contained in:
Rémi Verschelde
2018-03-20 11:23:15 +01:00
committed by GitHub
parent d486973f58 8eedb2afe2
commit a238e53da9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
servers/visual/visual_server_canvas.cpp
View File

@@ -440,13 +440,17 @@ void VisualServerCanvas::canvas_item_add_polyline(RID p_item, const Vector<Point
if (p_antialiased) { if (p_antialiased) {
pline->line_colors.push_back(Color(1, 1, 1, 1)); pline->line_colors.push_back(Color(1, 1, 1, 1));
} }
} } else if (p_colors.size() == 1) {
if (p_colors.size() == 1) {
pline->triangle_colors = p_colors; pline->triangle_colors = p_colors;
pline->line_colors = p_colors; pline->line_colors = p_colors;
} else { } else {
pline->triangle_colors.resize(pline->triangles.size()); if (p_colors.size() != p_points.size()) {
pline->line_colors.resize(pline->lines.size()); pline->triangle_colors.push_back(p_colors[0]);
pline->line_colors.push_back(p_colors[0]);
} else {
pline->triangle_colors.resize(pline->triangles.size());
pline->line_colors.resize(pline->lines.size());
}
} }
for (int i = 0; i < p_points.size(); i++) { for (int i = 0; i < p_points.size(); i++) {