Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 2 Aug 2018 07:52:22 +0000 (17:52 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 2 Aug 2018 07:52:22 +0000 (17:52 +1000)
1  2 
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_sculpt_paint.c

index 1f8f95cf38089180949d5dc079fa8502b02d9204,92f05bf366f1888698485fdb049a7d5ffcb2a12a..c500c5f261fcf86a6fb96e10a2dabe819567a5a2
@@@ -201,14 -186,15 +201,15 @@@ static void rna_ParticleEdit_tool_set(P
  
        pset->brushtype = value;
  }
- static const EnumPropertyItem *rna_ParticleEdit_tool_itemf(bContext *C, PointerRNA *UNUSED(ptr),
-                                                      PropertyRNA *UNUSED(prop), bool *UNUSED(r_free))
+ static const EnumPropertyItem *rna_ParticleEdit_tool_itemf(
+         bContext *C, PointerRNA *UNUSED(ptr),
+         PropertyRNA *UNUSED(prop), bool *UNUSED(r_free))
  {
 -      Scene *scene = CTX_data_scene(C);
 -      Object *ob = (scene->basact) ? scene->basact->object : NULL;
 +      ViewLayer *view_layer = CTX_data_view_layer(C);
 +      Object *ob = OBACT(view_layer);
  #if 0
 -      Main *bmain = CTX_data_main(C);
 -      PTCacheEdit *edit = PE_get_current(bmain, scene, ob);
 +      Scene *scene = CTX_data_scene(C);
 +      PTCacheEdit *edit = PE_get_current(scene, ob);
        ParticleSystem *psys = edit ? edit->psys : NULL;
  #else
        /* use this rather than PE_get_current() - because the editing cache is