Merge branch 'master' into blender2.8

2018-07-01 16:22:06 +02:00
parent bc95c7a3ea ddee0931b8
commit 36a9436d80
69 changed files with 444 additions and 365 deletions
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -5160,7 +5160,7 @@ void BKE_curve_material_index_clear(Curve *cu)
 	}
 }

-int BKE_curve_material_index_validate(Curve *cu)
+bool BKE_curve_material_index_validate(Curve *cu)
 {
 	const int curvetype = BKE_curve_type_get(cu);
 	bool is_valid = true;