svn merge -r 21508:22111 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Sat, 1 Aug 2009 10:21:26 +0000 (10:21 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Sat, 1 Aug 2009 10:21:26 +0000 (10:21 +0000)
commitc3a4936d9dc4abc6be5c74a16521d252893a2805
tree0c4ef038058d84e37a0c302bef89240eb780d2e0
parent2830f25ff3bf7a80c88b86132f76081ced3e86a1
parent78bbe5c479f80a331528d730486770c4f46e74fc
svn merge -r 21508:22111 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/editors/armature/meshlaplacian.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/SConscript
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