Merging r58701 through r58746 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 30 Jul 2013 19:05:29 +0000 (19:05 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 30 Jul 2013 19:05:29 +0000 (19:05 +0000)
1  2 
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c

Simple merge