Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 12 Dec 2017 02:55:09 +0000 (13:55 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 12 Dec 2017 02:55:09 +0000 (13:55 +1100)
commit41fc0a0624230e50ee4f8521915e093d1dee0bf2
tree4d7258ae539e09c70ab224ad39df9e87acfb88d2
parent1b2ac71f4565593afd4fc8880fa93c888eeb9c49
parent58aa31a9ec0fc5b7dbef02b4308a826b49abf3d8
Merge branch 'master' into blender2.8
make.bat
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_templates.c
source/blender/windowmanager/intern/wm_files.c