Merging r37371 through r37433 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Jun 2011 18:20:36 +0000 (18:20 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Jun 2011 18:20:36 +0000 (18:20 +0000)
1  2 
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_userdef.c
source/creator/CMakeLists.txt

Simple merge