blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

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.
This commit is contained in:
Campbell Barton 2021-05-07 11:03:45 +10:00
parent 78b2b5fc0e
commit 4243ee7d19
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/object/object_modes.c
View File

@ -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: