[Bf-blender-cvs] [a108d81af96] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: a108d81af966e4d6b2f29fadcfb28b4084276ad1
Author: Campbell Barton
Date:   Tue Aug 1 15:00:49 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBa108d81af966e4d6b2f29fadcfb28b4084276ad1

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/makesrna/intern/rna_scene.c
index 5f9d312fd4a,24ecf2e64ca..3bd104f1e7d
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -436,15 -438,8 +443,17 @@@ static EnumPropertyItem rna_enum_gpenci
  	
  	{0, NULL, 0, NULL, NULL}
  };
 +
+ #endif
+ 
 +EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 +	{COLLECTION_MODE_OBJECT, "OBJECT", 0, "Object", ""},
 +	{COLLECTION_MODE_EDIT, "EDIT", 0, "Edit", ""},
 +	{COLLECTION_MODE_PAINT_WEIGHT, "PAINT_WEIGHT", 0, "Weight Paint", ""},
 +	{COLLECTION_MODE_PAINT_WEIGHT, "PAINT_VERTEX", 0, "Vertex Paint", ""},
 +	{0, NULL, 0, NULL, NULL}
 +};
 +
  #ifdef RNA_RUNTIME
  
  #include "DNA_anim_types.h"