[Bf-blender-cvs] [1151bcd53d1] master: Merge branch 'blender-v2.83-release'

[Campbell Barton]

Commit: 1151bcd53d1d6bd620550047b6898441096753e9
Author: Campbell Barton
Date:   Tue May 19 13:31:48 2020 +1000
Branches: master
https://developer.blender.org/rB1151bcd53d1d6bd620550047b6898441096753e9

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/editors/physics/particle_edit.c
index 6cafc51231c,c60f3c37640..ca2dec75160
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@@ -5251,12 -5247,9 +5251,9 @@@ static bool particle_edit_toggle_poll(b
    if (!ob->data || ID_IS_LINKED(ob->data)) {
      return 0;
    }
-   if (CTX_data_edit_object(C)) {
-     return 0;
-   }
  
 -  return (ob->particlesystem.first || modifiers_findByType(ob, eModifierType_Cloth) ||
 -          modifiers_findByType(ob, eModifierType_Softbody));
 +  return (ob->particlesystem.first || BKE_modifiers_findby_type(ob, eModifierType_Cloth) ||
 +          BKE_modifiers_findby_type(ob, eModifierType_Softbody));
  }
  
  static void free_all_psys_edit(Object *object)