diff options
| author | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2015-11-19 17:18:53 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 19:21:42 +0200 |
| commit | cad6045f5c1870bbc7b3c909b08b84d9d1ccc235 (patch) | |
| tree | 00d28cf5a6145222c79d04bb2507a36397505fcc /slideshow | |
| parent | ba02afad40570cf45b1f4af3287333e7c060a3fd (diff) | |
slideshow: Always enable normals, there is no case where they are empty
Change-Id: Ia45a3ec98a1f548b5a976f485d4165bb3d1ff2e4
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 54033dfbe795..11e6c4e92093 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -251,14 +251,9 @@ void Primitive::display(double nTime, double WidthScale, double HeightScale) con CHECK_GL_ERROR(); glEnableClientState( GL_VERTEX_ARRAY ); CHECK_GL_ERROR(); - if(!Normals.empty()) - { - CHECK_GL_ERROR(); - glNormalPointer( GL_FLOAT , 0 , &Normals[0] ); - CHECK_GL_ERROR(); - glEnableClientState( GL_NORMAL_ARRAY ); - CHECK_GL_ERROR(); - } + glNormalPointer( GL_FLOAT , 0 , &Normals[0] ); + CHECK_GL_ERROR(); + glEnableClientState( GL_NORMAL_ARRAY ); CHECK_GL_ERROR(); glEnableClientState( GL_TEXTURE_COORD_ARRAY ); CHECK_GL_ERROR(); |