svn merge -r 22371:22571 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 17 Aug 2009 17:43:49 +0000 (17:43 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 17 Aug 2009 17:43:49 +0000 (17:43 +0000)
commit950b770c1ea0c05a907abc93ad7174a02432843f
tree12936d6440bc7a0710a2fc776d1e122e000ea71e
parent0e3acbaa386384f1b1d27a2b4e0f0dcd07c0e0e2
parent931ffbedaa3e76a6ebec3df2af22176e504158db
svn merge -r 22371:22571 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
release/ui/buttons_scene.py
source/blender/blenkernel/BKE_utildefines.h
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/shadeinput.c
source/blender/windowmanager/intern/wm_init_exit.c