[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32146] trunk/blender/source/blender/ editors/uvedit/uvedit_ops.c: bugfix [#23447] wrong vertices/ edges selected in UV editor

[Campbell Barton]

Revision: 32146
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32146
Author:   campbellbarton
Date:     2010-09-27 11:50:20 +0200 (Mon, 27 Sep 2010)

Log Message:
-----------
bugfix [#23447] wrong vertices/edges selected in UV editor

Modified Paths:
--------------
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2010-09-27 09:43:21 UTC (rev 32145)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2010-09-27 09:50:20 UTC (rev 32146)
@@ -245,9 +245,9 @@
 	int nvert= (efa->v4)? 4: 3;
 
 	if(ts->uv_flag & UV_SYNC_SELECTION) {
-		if(ts->selectmode == SCE_SELECT_FACE)
+		if(ts->selectmode & SCE_SELECT_FACE)
 			return (efa->f & SELECT);
-		else if(ts->selectmode == SCE_SELECT_EDGE)
+		else if(ts->selectmode & SCE_SELECT_EDGE)
 			return (*(&efa->e1 + i))->f & SELECT;
 		else
 			return (((efa->v1 + i)->f & SELECT) && ((efa->v1 + (i+1)%nvert)->f & SELECT));
@@ -262,9 +262,9 @@
 	int nvert= (efa->v4)? 4: 3;
 
 	if(ts->uv_flag & UV_SYNC_SELECTION) {
-		if(ts->selectmode == SCE_SELECT_FACE)
+		if(ts->selectmode & SCE_SELECT_FACE)
 			EM_select_face(efa, 1);
-		else if(ts->selectmode == SCE_SELECT_EDGE)
+		else if(ts->selectmode & SCE_SELECT_EDGE)
 			EM_select_edge((*(&efa->e1 + i)), 1);
 		else {
 			(efa->v1 + i)->f |= SELECT;
@@ -281,9 +281,9 @@
 	int nvert= (efa->v4)? 4: 3;
 
 	if(ts->uv_flag & UV_SYNC_SELECTION) {
-		if(ts->selectmode == SCE_SELECT_FACE)
+		if(ts->selectmode & SCE_SELECT_FACE)
 			EM_select_face(efa, 0);
-		else if(ts->selectmode == SCE_SELECT_EDGE)
+		else if(ts->selectmode & SCE_SELECT_EDGE)
 			EM_select_edge((*(&efa->e1 + i)), 0);
 		else {
 			(efa->v1 + i)->f &= ~SELECT;
@@ -299,7 +299,7 @@
 	ToolSettings *ts= scene->toolsettings;
 
 	if(ts->uv_flag & UV_SYNC_SELECTION) {
-		if(ts->selectmode == SCE_SELECT_FACE)
+		if(ts->selectmode & SCE_SELECT_FACE)
 			return (efa->f & SELECT);
 		else
 			return (*(&efa->v1 + i))->f & SELECT;
@@ -313,7 +313,7 @@
 	ToolSettings *ts= scene->toolsettings;
 
 	if(ts->uv_flag & UV_SYNC_SELECTION) {
-		if(ts->selectmode == SCE_SELECT_FACE)
+		if(ts->selectmode & SCE_SELECT_FACE)
 			EM_select_face(efa, 1);
 		else
 			(*(&efa->v1 + i))->f |= SELECT;
@@ -327,7 +327,7 @@
 	ToolSettings *ts= scene->toolsettings;
 
 	if(ts->uv_flag & UV_SYNC_SELECTION) {
-		if(ts->selectmode == SCE_SELECT_FACE)
+		if(ts->selectmode & SCE_SELECT_FACE)
 			EM_select_face(efa, 0);
 		else
 			(*(&efa->v1 + i))->f &= ~SELECT;