Merging r58756 through r58777 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 31 Jul 2013 20:49:39 +0000 (20:49 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 31 Jul 2013 20:49:39 +0000 (20:49 +0000)
commit86cb81abb900786f3184027d1362b154c01bb964
treea17f6134b41323b51bd430a0b1a0c0735c697a3d
parentfc598dbf3800ef441b5d9803ca9b5ce734a994e3
parent3840e0b2347200ceb414f12deb3436b20d274c66
Merging r58756 through r58777 from trunk into soc-2013-depsgraph_mt
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_event_system.c