[Bf-blender-cvs] [30ccca03d49] greasepencil-object: Redo mode settings after merge

[Antonio Vazquez]

Commit: 30ccca03d49b61506ee646fd4e06fbf221b01256
Author: Antonio Vazquez
Date:   Wed May 30 16:28:42 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB30ccca03d49b61506ee646fd4e06fbf221b01256

Redo mode settings after merge

This code section was changed in the last merge

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

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 6d4997a67ee..51a72d1e0e4 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1353,6 +1353,26 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 	const bool toggle = RNA_boolean_get(op->ptr, "toggle");
 
 	if (use_submode) {
+		/* grease pencil modes that reuse the same modes but only
+		* for grease pencil objects
+		*/
+		if (ob) {
+			if (ob->type == OB_GPENCIL) {
+				if (mode == OB_MODE_EDIT) {
+					mode = OB_MODE_GPENCIL_EDIT;
+				}
+				if (mode == OB_MODE_SCULPT) {
+					mode = OB_MODE_GPENCIL_SCULPT;
+				}
+				if (mode == OB_MODE_VERTEX_PAINT) {
+					mode = OB_MODE_GPENCIL_PAINT;
+				}
+				if (mode == OB_MODE_WEIGHT_PAINT) {
+					mode = OB_MODE_GPENCIL_WEIGHT;
+				}
+			}
+		}
+
 		/* When not changing modes use submodes, see: T55162. */
 		if (toggle == false) {
 			if (mode == restore_mode) {