[Bf-blender-cvs] [4243ee7d195] master: Object Mode: avoid error message with particle-edit mode switch

[Campbell Barton]

Commit: 4243ee7d1956f689a9354a2e27d2854f0f4263b9
Author: Campbell Barton
Date:   Fri May 7 11:03:45 2021 +1000
Branches: master
https://developer.blender.org/rB4243ee7d1956f689a9354a2e27d2854f0f4263b9

Object Mode: avoid error message with particle-edit mode switch

Mode switching passed through when the mode wasn't supported for all
modes except particle edit-mode.

Add a check to ED_object_mode_compat_test to prevent the error message.

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

M	source/blender/editors/object/object_modes.c

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

diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c
index ff1855cafc5..c0c6b09ec3f 100644
--- a/source/blender/editors/object/object_modes.c
+++ b/source/blender/editors/object/object_modes.c
@@ -123,9 +123,14 @@ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode)
     switch (ob->type) {
       case OB_MESH:
         if (mode & (OB_MODE_EDIT | OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT |
-                    OB_MODE_TEXTURE_PAINT | OB_MODE_PARTICLE_EDIT)) {
+                    OB_MODE_TEXTURE_PAINT)) {
           return true;
         }
+        if (mode & OB_MODE_PARTICLE_EDIT) {
+          if (ED_object_particle_edit_mode_supported(ob)) {
+            return true;
+          }
+        }
         break;
       case OB_CURVE:
       case OB_SURF: