merge from trunk r37405
authorXiao Xiangquan <xiaoxiangquan@gmail.com>
Sat, 11 Jun 2011 12:48:13 +0000 (12:48 +0000)
committerXiao Xiangquan <xiaoxiangquan@gmail.com>
Sat, 11 Jun 2011 12:48:13 +0000 (12:48 +0000)
commit2d3795ab3c5b107702012b21354174da2ca00e33
tree3940a0ed198699fa9fc75220464e155d463f1f97
parent34a22b3b78b6c577fdb048751f58cce89f68a2d9
parent81946b9138201800e495eb28addf254958feb1a4
merge from trunk r37405
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/creator/CMakeLists.txt
source/creator/creator.c