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/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -333,7 +333,8 @@ bool ED_object_add_generic_get_opts(bContext *C, wmOperator *op, const char view

 	/* Get layers! */
 	{
-		int a, layer_values[20];
+		int a;
+		bool layer_values[20];
 		if (!layer)
 			layer = &_layer;