Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Sep 2017 01:18:23 +0000 (11:18 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Sep 2017 01:18:23 +0000 (11:18 +1000)
commit9bd40cbce17fdc6368814f7cdeaef9bca3fcb7e5
tree0a7a20e1987174f6d56fe71bc119f8f54cf6b1b5
parenta24dd6eabafa421352488bc8721a02690da2177f
parent43b49130516db974c125d89919fe8ddc25cf4405
Merge branch 'master' into blender2.8
12 files changed:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap.c
source/blender/windowmanager/intern/wm_gesture.c