Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 1 Mar 2017 13:22:13 +0000 (00:22 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 1 Mar 2017 13:22:13 +0000 (00:22 +1100)
commit8901263b5f04152a9c6a897c5115acd51be11bf1
tree14629685150a04440e2629fd45bd90891b8767ed
parentf64df0e1024c2447ad449d0bf63def871ee47925
parent714e85b5344db7d9c9c7ac0a91cd0bb574c35353
Merge branch 'master' into blender2.8
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/render/CMakeLists.txt