svn merge -r 22138:22364 https://svn.blender.org/svnroot/bf-blender/branches/blender...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 11 Aug 2009 12:55:50 +0000 (12:55 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 11 Aug 2009 12:55:50 +0000 (12:55 +0000)
commitf88eb78bafb28044466d1cbe0b0a4d6fc3c6a2a1
tree20808ab975963497696590507ab3e0162bec1abd
parent5d40c1b59784316473b79d5a61188f3e17f020b7
parent1d63cacfe4843b53f887bf7eaa83300a0cb73e6c
 svn merge -r 22138:22364 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
release/ui/buttons_scene.py
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_init_exit.c