merged changes to revisio 23915
authorMaxime Curioni <maxime.curioni@gmail.com>
Sun, 18 Oct 2009 05:19:46 +0000 (05:19 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sun, 18 Oct 2009 05:19:46 +0000 (05:19 +0000)
commit3fa9da938f0d378c36343aabfa135b35d81ee093
treeb6bc001e2e8976ef675359ece06ede90fc5be9e4
parent94711098e4bc0f2c95c11c0cdb0766857872f87a
parent55e6aa77c4fa014730096f2debba2cb979a0f9de
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.
release/scripts/ui/buttons_render.py
release/scripts/ui/buttons_scene.py
source/blender/blenloader/intern/readfile.c
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c