[Bf-blender-cvs] [56f97a4deb3] temp-object-multi-mode: Check types match before entering editmode

[Campbell Barton]

Commit: 56f97a4deb39130030f9ad61df66e4e78da1e345
Author: Campbell Barton
Date:   Wed Apr 11 08:38:37 2018 +0200
Branches: temp-object-multi-mode
https://developer.blender.org/rB56f97a4deb39130030f9ad61df66e4e78da1e345

Check types match before entering editmode

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

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 77c16887528..2621aa7fe97 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -471,7 +471,7 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op)
 		if (obact->mode & mode_flag) {
 			FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
 			{
-				if (ob != obact) {
+				if ((ob != obact) && (ob->type == obact->type)) {
 					if (ob->flag & SELECT) {
 						ED_object_editmode_enter_ex(scene, ob, EM_WAITCURSOR | EM_NO_CONTEXT);
 					}
@@ -485,7 +485,7 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op)
 		if ((obact->mode & mode_flag) == 0) {
 			FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
 			{
-				if (ob != obact) {
+				if ((ob != obact) && (ob->type == obact->type)) {
 					if (ob->flag & SELECT) {
 						ED_object_editmode_exit_ex(NULL, scene, ob, EM_FREEDATA | EM_WAITCURSOR);
 					}