diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-19 14:40:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-19 14:40:48 +0400 |
| commit | 2457d4f5abd65095ae48be937ed43d026d47124a (patch) | |
| tree | 79c9b666420fa06262c90fa8f9d11ec77e285719 /source/gameengine | |
| parent | 5c6ee6b523c6a53c310683a9f7fbe5d730db6122 (diff) | |
| parent | 90ef435145416313596cafa6f8c4c6c6aebe4e44 (diff) | |
svn merge ^/trunk/blender -r42680:42722
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_2DFilterManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp index 4eadf8e3e66..30344ce3a10 100644 --- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp +++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp @@ -431,6 +431,8 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas) glViewport(0,0, texturewidth, textureheight); glDisable(GL_DEPTH_TEST); + // in case the previous material was wire + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); // if the last rendered face had alpha add it would messes with the color of the plane we apply 2DFilter to glDisable(GL_BLEND); glPushMatrix(); //GL_MODELVIEW |