Merging r58196 through r58265 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 15 Jul 2013 11:25:56 +0000 (11:25 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 15 Jul 2013 11:25:56 +0000 (11:25 +0000)
commitd44fb5bd8b8fdb2635ae060ef2a92bb883ff50e0
treefd56760dba11d02d133ac9711dcc3501754fc6c4
parente3c645fe469e35c76a66fe9490048a68efa41647
parentabe84a4f43939fd14a4830d958890e870ddeb180
Merging r58196 through r58265 from trunk into soc-2013-depsgraph_mt
14 files changed:
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/editors/object/object_add.c
source/blender/editors/render/render_internal.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_main_api.c