[Bf-blender-cvs] [d0ce4d838b5] greasepencil-object: Fix problem to enter in edit mode with Tab key

Antonio Vazquez noreply at git.blender.org
Tue Mar 20 12:42:06 CET 2018


Commit: d0ce4d838b5e25d62186d472532b4c7bda8a213d
Author: Antonio Vazquez
Date:   Tue Mar 20 12:41:58 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd0ce4d838b5e25d62186d472532b4c7bda8a213d

Fix problem to enter in edit mode with Tab key

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

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

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

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index cc316fa7835..e1362611f3f 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1516,7 +1516,8 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 			bGPdata *gpd = (bGPdata *)ob->data;
 			/* restore status */
 			if ((workspace->object_mode == OB_MODE_OBJECT) &&
-				((workspace->object_mode != mode) || (mode == OB_MODE_OBJECT)))
+				((workspace->object_mode != mode) || (mode == OB_MODE_OBJECT)) &&
+				(mode != OB_MODE_EDIT))
 			{
 				if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
 					workspace->object_mode = OB_MODE_GPENCIL_EDIT;
@@ -1543,7 +1544,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 			/* set status */
 			if (ELEM(mode, OB_MODE_OBJECT, OB_MODE_EDIT, OB_MODE_POSE)) {
 				workspace->object_mode_restore = OB_MODE_OBJECT;
-				if (ELEM(workspace->object_mode, OB_MODE_EDIT, OB_MODE_GPENCIL_EDIT)) {
+				if (ELEM(workspace->object_mode, OB_MODE_EDIT, OB_MODE_GPENCIL_EDIT) || (mode == OB_MODE_EDIT)) {
 					WM_operator_name_call(C, "GPENCIL_OT_editmode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
 				}
 				if (workspace->object_mode == OB_MODE_GPENCIL_PAINT) {
diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c
index a2488297447..84bb78a74f5 100644
--- a/source/blender/editors/object/object_modes.c
+++ b/source/blender/editors/object/object_modes.c
@@ -116,7 +116,7 @@ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode)
 					return true;
 				break;
 			case OB_GPENCIL:
-				if (mode & (OB_MODE_GPENCIL_EDIT | OB_MODE_GPENCIL_PAINT |
+				if (mode & (OB_MODE_EDIT | OB_MODE_GPENCIL_EDIT | OB_MODE_GPENCIL_PAINT |
 					OB_MODE_GPENCIL_SCULPT | OB_MODE_GPENCIL_WEIGHT))
 				{
 					return true;



More information about the Bf-blender-cvs mailing list