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 /test/envs/opengl/transform_test.cpp | |
| 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 'test/envs/opengl/transform_test.cpp')
| -rw-r--r-- | test/envs/opengl/transform_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/envs/opengl/transform_test.cpp b/test/envs/opengl/transform_test.cpp index 58d8e9e..99ec9f0 100644 --- a/test/envs/opengl/transform_test.cpp +++ b/test/envs/opengl/transform_test.cpp @@ -73,7 +73,7 @@ void Render(Gfx::CGLDevice *device) worldMat.LoadIdentity(); device->SetTransform(Gfx::TRANSFORM_WORLD, worldMat); - Gfx::VertexCol line[2] = { Gfx::VertexCol() }; + Gfx::VertexCol line[2] = {}; for (int x = -40; x <= 40; ++x) { @@ -98,7 +98,7 @@ void Render(Gfx::CGLDevice *device) } - Gfx::VertexCol quad[6] = { Gfx::VertexCol() }; + Gfx::VertexCol quad[6] = {}; for (int i = 0; i < 6; ++i) quad[i].color = Gfx::Color(1.0f, 1.0f, 0.0f); |