diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2009-10-18 09:19:46 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2009-10-18 09:19:46 +0400 |
| commit | 3fa9da938f0d378c36343aabfa135b35d81ee093 (patch) | |
| tree | b6bc001e2e8976ef675359ece06ede90fc5be9e4 /source/blender/freestyle | |
| parent | 94711098e4bc0f2c95c11c0cdb0766857872f87a (diff) | |
| parent | 55e6aa77c4fa014730096f2debba2cb979a0f9de (diff) | |
merged changes to revisio 23915
Updated buttons_render.py to have Freestyle buttons
Added "empty" BlenderTextureManager as preliminary step to remove last remnants of OpenGL and to allow Freestyle to run on my machine.
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 3759a1206a8..e16568b5cf6 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -2,7 +2,7 @@ # include "../stroke/Canvas.h" # include "../application/AppConfig.h" -# include "../rendering/GLStrokeRenderer.h" +# include "BlenderTextureManager.h" #ifdef __cplusplus extern "C" { @@ -36,7 +36,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re) :StrokeRenderer(){ // TEMPORARY - need a texture manager - _textureManager = new GLTextureManager; + _textureManager = new BlenderTextureManager; _textureManager->load(); // Scene.New("FreestyleStrokes") |