Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 11 Mar 2017 16:00:06 +0000 (03:00 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 11 Mar 2017 16:00:06 +0000 (03:00 +1100)
commitfbb1b311ea189b4d215cdfca3f507acb29ad2f3f
treeda426f375bb7ffc5cad6227931fa99ee8a5e9919
parentcdb7498f663e539f05bc314c4e80c55ba45cdc02
parentbcc8c04db4a111b692660a7706757290a5f03465
Merge branch 'master' into blender2.8
14 files changed:
CMakeLists.txt
GNUmakefile
build_files/cmake/macros.cmake
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap_object.c
source/blender/gpu/intern/gpu_debug.c