Merging r59104 through r59112 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Aug 2013 15:09:19 +0000 (15:09 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Aug 2013 15:09:19 +0000 (15:09 +0000)
commitb521d2ada779a881bc379a5f4b927b0853015c0e
tree525e96d5ca05e20fc7faef7e3e13e6712aac1cd0
parent4dee746acb3bd64b5027d56158f0659d9dcfe56a
parent135ee563e94b064ba4d4524a5a25c1c7b3964519
Merging r59104 through r59112 from trunk into soc-2013-depsgraph_mt
source/blender/blenkernel/intern/material.c