[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60481] trunk/blender/source/blender/ editors: check SELECT flags for curves ( was checking for nonzero which would break if new files use this field for other flags )

Campbell Barton ideasman42 at gmail.com
Tue Oct 1 14:35:43 CEST 2013


Revision: 60481
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60481
Author:   campbellbarton
Date:     2013-10-01 12:35:43 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
check SELECT flags for curves (was checking for nonzero which would break if new files use this field for other flags)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_info/info_stats.c
    trunk/blender/source/blender/editors/transform/transform_manipulator.c
    trunk/blender/source/blender/editors/transform/transform_snap.c

Modified: trunk/blender/source/blender/editors/space_info/info_stats.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_stats.c	2013-10-01 12:11:10 UTC (rev 60480)
+++ trunk/blender/source/blender/editors/space_info/info_stats.c	2013-10-01 12:35:43 UTC (rev 60481)
@@ -194,9 +194,9 @@
 				a = nu->pntsu;
 				while (a--) {
 					stats->totvert += 3;
-					if (bezt->f1) stats->totvertsel++;
-					if (bezt->f2) stats->totvertsel++;
-					if (bezt->f3) stats->totvertsel++;
+					if (bezt->f1 & SELECT) stats->totvertsel++;
+					if (bezt->f2 & SELECT) stats->totvertsel++;
+					if (bezt->f3 & SELECT) stats->totvertsel++;
 					bezt++;
 				}
 			}

Modified: trunk/blender/source/blender/editors/transform/transform_manipulator.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_manipulator.c	2013-10-01 12:11:10 UTC (rev 60480)
+++ trunk/blender/source/blender/editors/transform/transform_manipulator.c	2013-10-01 12:35:43 UTC (rev 60481)
@@ -428,11 +428,11 @@
 								totsel++;
 							}
 							else {
-								if (bezt->f1) {
+								if (bezt->f1 & SELECT) {
 									calc_tw_center(scene, bezt->vec[(v3d->around == V3D_LOCAL) ? 1 : 0]);
 									totsel++;
 								}
-								if (bezt->f3) {
+								if (bezt->f3 & SELECT) {
 									calc_tw_center(scene, bezt->vec[(v3d->around == V3D_LOCAL) ? 1 : 2]);
 									totsel++;
 								}

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c	2013-10-01 12:11:10 UTC (rev 60480)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c	2013-10-01 12:35:43 UTC (rev 60481)
@@ -134,7 +134,8 @@
 
 bool activeSnap(TransInfo *t)
 {
-	return (t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP || (t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP_INVERT;
+	return ((t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP) ||
+	       ((t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP_INVERT);
 }
 
 void drawSnapping(const struct bContext *C, TransInfo *t)




More information about the Bf-blender-cvs mailing list