svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 6 Oct 2009 01:58:22 +0000 (01:58 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 6 Oct 2009 01:58:22 +0000 (01:58 +0000)
commit63a88075b574e8f2f9adc041f423f49a7356d736
tree951f1f65d74d052debdafa14f6ad22750b6aad04
parent11bdf6ea10ee7bc5e2862cdddbf42eddb06c42fa
parent69a24325742c617a9902376b061006dfb24f0a3c
svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/blender
12 files changed:
release/scripts/ui/buttons_scene.py
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/SConscript
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/renderdatabase.c
source/blender/render/intern/source/volume_precache.c
source/blender/render/intern/source/volumetric.c
source/blender/windowmanager/intern/wm_init_exit.c