svn merge -r 21372:21508 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 10 Jul 2009 21:49:40 +0000 (21:49 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 10 Jul 2009 21:49:40 +0000 (21:49 +0000)
1  2 
release/ui/buttons_scene.py
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c

Simple merge