Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Aug 2017 05:00:49 +0000 (15:00 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Aug 2017 05:00:49 +0000 (15:00 +1000)
1  2 
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sculpt_paint.c

index 5f9d312fd4acaefd95db3dad4c0189f3a7e57b49,24ecf2e64ca360b228b39e39caa6894f69745360..3bd104f1e7d273e0ae7b5666591fef76bab93113
@@@ -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"