Merge branch 'blender-v2.83-release'

2020-05-19 13:31:44 +10:00 · 2020-05-19 13:31:44 +10:00 · f557198540
parent 7bd07c9f5a 1afa97d547
commit f557198540
1 changed files with 0 additions and 3 deletions
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@ -1130,9 +1130,6 @@ static bool texture_paint_toggle_poll(bContext *C)
  if (!ob->data || ID_IS_LINKED(ob->data)) {
    return 0;
  }
-  if (CTX_data_edit_object(C)) {
-    return 0;
-  }

  return 1;
 }