svn merge: Merging r46558 through r46612, from trunk
authorCampbell Barton <ideasman42@gmail.com>
Sun, 13 May 2012 18:16:25 +0000 (18:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 13 May 2012 18:16:25 +0000 (18:16 +0000)
commit2a3fddf5b305c3434d11ab9254bd5605f79f4c3c
tree6a9251e4a030e23f9ebffd9124cf63e9bdbf9094
parent7444613a9a2ff8433712b2dc0525ee91a44c04a7
parente5963aae1de14c4aaf2953b1cb91b4119415c565
svn merge: Merging r46558 through r46612, from trunk
20 files changed:
source/blender/blenkernel/BKE_context.h
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/idcode.c
source/blender/editors/include/ED_clip.h
source/blender/editors/include/ED_screen.h
source/blender/editors/include/ED_transform.h
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_space.c