diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
| commit | 96d49d84aafecd78c902681f20de6207badf7e85 (patch) | |
| tree | 7a835fce4f264c6c0886441c4f79e02cdf47582c /src/graphics/core/vertex.h | |
| parent | 5223ef1fb116780298495a4d2f63e6c2c39fdfbd (diff) | |
| parent | 852223262055440569ecca70f1b9da46089424c4 (diff) | |
| download | colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.gz colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.bz2 colobot-96d49d84aafecd78c902681f20de6207badf7e85.zip | |
Merge branch 'dev' into dev-physfs
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
Diffstat (limited to 'src/graphics/core/vertex.h')
| -rw-r--r-- | src/graphics/core/vertex.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/graphics/core/vertex.h b/src/graphics/core/vertex.h index c3a657a..ca68352 100644 --- a/src/graphics/core/vertex.h +++ b/src/graphics/core/vertex.h @@ -82,7 +82,9 @@ struct VertexCol Math::Vector coord; Color color; - explicit VertexCol(Math::Vector aCoord = Math::Vector(), + VertexCol() = default; + + explicit VertexCol(Math::Vector aCoord, Color aColor = Color()) : coord(aCoord), color(aColor) {} |