Merging r41536 through r41554 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 5 Nov 2011 11:50:40 +0000 (11:50 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 5 Nov 2011 11:50:40 +0000 (11:50 +0000)
16 files changed:
1  2 
source/blender/blenkernel/BKE_context.h
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/include/ED_transform.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/include/UI_interface.h
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/transform/transform.c
source/blender/imbuf/intern/moviecache.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/creator/creator.c

Simple merge
Simple merge