Merging r57989 through r58072 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 Jul 2013 11:29:08 +0000 (11:29 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 Jul 2013 11:29:08 +0000 (11:29 +0000)
1  2 
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/editors/object/object_add.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/WM_api.h
source/creator/creator.c

Simple merge
Simple merge