Bugfix #4878

In UV-Face-select mode, a CTRL+click can activate a new Object but keeps the
UV-Face-select mode. This skips the initialization required for this mode,
causing a crash, so it better should end the mode.
(It used to work in past though...)

1 files changed, 4 insertions, 3 deletions

diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index 001105c43a9..0a19c86a070 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -1422,9 +1422,10 @@ void mouse_select(void)
 				if(G.f & G_VERTEXPAINT) {
 					set_vpaint();	/* toggle */
 				}
-				if(G.f & G_FACESELECT) {
-					set_faceselect();	/* toggle */
-				}
+			}
+			/* always end this */
+			if(G.f & G_FACESELECT) {
+				set_faceselect();	/* toggle */
 			}
 			
 			allqueue(REDRAWBUTSLOGIC, 0);