Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 4 Aug 2017 21:53:07 +0000 (07:53 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 4 Aug 2017 21:53:07 +0000 (07:53 +1000)
commit48adef4444a8276ce1d89b122346ae0426493574
tree745c37121fbfb353531382b19be2ce1922f9ecbb
parent796437247f87852026b9632f520bdcf071340b86
parentfa05718f278d6810356e64fafcf32c6222d67aab
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp
source/blender/editors/curve/editcurve_paint.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_space.c