Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-05-19 06:31:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-05-19 06:31:48 +0300
commit1151bcd53d1d6bd620550047b6898441096753e9 (patch)
tree344c8bc0dd7f9ef0ffa5fa95d4d761c12e32999b /source/blender/editors/physics
parentf5571985405dbb30c19bdcadc1bfcd337cf7b621 (diff)
parent15bf81268cd4dfa48c1cf72d504a226943ac6e88 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/particle_edit.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 6cafc51231c..ca2dec75160 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -5251,9 +5251,6 @@ static bool particle_edit_toggle_poll(bContext *C)
if (!ob->data || ID_IS_LINKED(ob->data)) {
return 0;
}
- if (CTX_data_edit_object(C)) {
- return 0;
- }
return (ob->particlesystem.first || BKE_modifiers_findby_type(ob, eModifierType_Cloth) ||
BKE_modifiers_findby_type(ob, eModifierType_Softbody));