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>2018-04-19 09:58:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-19 09:58:49 +0300
commit81673f5ab7f4d404b9b263bac88e8b271b0ccdac (patch)
tree9d2e49518bf49885c18776d651071506a7c18c4a /source/blender/blenkernel
parent9a301978bdf0a7bab8dedf62e8c623aa33e96177 (diff)
Fix T54712: Undo w/ multi-edit failed
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index addf84224ac..53ca20e3c2a 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -511,7 +511,7 @@ bool BKE_object_is_in_editmode(const Object *ob)
bool BKE_object_is_in_editmode_and_selected(const Object *ob)
{
- if ((ob->flag & SELECT) && (BKE_object_is_in_editmode(ob))) {
+ if ((ob->base_flag & BASE_SELECTED) && (BKE_object_is_in_editmode(ob))) {
return true;
}
return false;