[Bf-blender-cvs] [bec911a9bfd] greasepencil-object: Fix problem with Ctrl + Tab for GP objects
Antonio Vazquez
noreply at git.blender.org
Mon Jun 12 11:12:00 CEST 2017
Commit: bec911a9bfda252133bfb1db76ba5ea0a1de9f87
Author: Antonio Vazquez
Date: Mon Jun 12 11:11:48 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBbec911a9bfda252133bfb1db76ba5ea0a1de9f87
Fix problem with Ctrl + Tab for GP objects
===================================================================
M source/blender/editors/object/object_edit.c
===================================================================
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 516db440ec3..62cc874ba5e 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1550,7 +1550,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
if ((ob) && (ob->type == OB_GPENCIL)) {
if ((ob->gpd) && (ob->gpd == gpd))
{
- if (ELEM(mode, OB_MODE_OBJECT, OB_MODE_EDIT)) {
+ if (ELEM(mode, OB_MODE_OBJECT, OB_MODE_EDIT, OB_MODE_POSE)) {
ob->restore_mode = OB_MODE_OBJECT;
if (ELEM(ob->mode, OB_MODE_OBJECT, OB_MODE_EDIT, OB_MODE_GPENCIL_EDIT)) {
WM_operator_name_call(C, "GPENCIL_OT_editmode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
More information about the Bf-blender-cvs
mailing list