Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2018 01:27:49 +0000 (11:27 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2018 01:27:49 +0000 (11:27 +1000)
commit143511b9613faeb974082be036ee0b45917200ae
tree83725a8b33364bad5281d45e23e2e57b2588bdf6
parentb831accc01a5790b6112f70e8bb5d6b3a8e8ab4d
parent98efcdb1a0e31beff50922132e475695c3ae6af7
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/curve.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_curve_api.c
source/blender/makesrna/intern/rna_internal.h