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)
commit558d1e8d4ac985c28fc455536453ea34ee6b8f0a
tree02817dddf6537711ed07be39e7195d76ae2b3cb0
parent860cd234577c170ac6025e4fa91a9a72f5f90d84
parentf6de4fecfa25f9d2da05755d2c3e14359518ce67
Merging r37371 through r37433 from trunk into soc-2011-tomato
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_userdef.c
source/creator/CMakeLists.txt