Merging r50413 through r50422 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 5 Sep 2012 14:19:40 +0000 (14:19 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 5 Sep 2012 14:19:40 +0000 (14:19 +0000)
commit16a126622eea530003defc89deb7d425cd23cea9
tree3adc22e1628a2495eb99d23255ca7178283e51e7
parent196028a99fd87efdf2e73c2c0a9020687088e3fc
Merging r50413 through r50422 from trunk into soc-2011-tomato
intern/cycles/render/attribute.cpp
source/blender/compositor/intern/COM_WorkScheduler.cpp
source/blender/editors/space_sequencer/sequencer_view.c