Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 10 Jul 2017 06:35:56 +0000 (16:35 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 10 Jul 2017 06:35:56 +0000 (16:35 +1000)
1  2 
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/curve.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_orientations.c

Simple merge