Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Jan 2017 17:11:42 +0000 (18:11 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Jan 2017 17:11:42 +0000 (18:11 +0100)
commit08ca32093a9927d98a94212d822518e184f1fcdd
tree20efe408ce26f2b3e47e98da510a94a02c36af3e
parent181424152611aa7d842ece0265fb6c630c7a4d77
parent39577403d3c421f51735613810ffcb4acc1e3894
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/ui.py
source/blender/editors/space_action/action_draw.c