Merging r41555 through r41563 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 5 Nov 2011 14:34:14 +0000 (14:34 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 5 Nov 2011 14:34:14 +0000 (14:34 +0000)
commit5a49d05eba32293b03814f8c4adcc05db6d37b17
tree66af4e4120ba03634161692a695e45efd3217486
parentcb67a63374aecdce9346a1b3c2b32704c938d9a7
parent885d1e6ed37ff725d920cf7c7b05c4e0fede2102
Merging r41555 through r41563 from trunk into soc-2011-tomato
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/nodes/composite/node_composite_util.h