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

[Campbell Barton]

Commit: d3c387d605470838e8f8349fa37c4b123e3e0471
Author: Campbell Barton
Date:   Thu Aug 2 17:52:22 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBd3c387d605470838e8f8349fa37c4b123e3e0471

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_sculpt_paint.c
index 1f8f95cf380,92f05bf366f..c500c5f261f
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@@ -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