[Bf-blender-cvs] [d84af36] master: EditCurve: Replace -1 with CU_ACT_NONE define

[Campbell Barton]

Commit: d84af360caa5df0361f792632566863bebda17dc
Author: Campbell Barton
Date:   Mon May 26 09:17:00 2014 +1000
https://developer.blender.org/rBd84af360caa5df0361f792632566863bebda17dc

EditCurve: Replace -1 with CU_ACT_NONE define

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

M	source/blender/blenkernel/intern/curve.c
M	source/blender/editors/curve/editcurve.c

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

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index a61a15f..e11af24 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -3984,7 +3984,7 @@ ListBase *BKE_curve_nurbs_get(Curve *cu)
 void BKE_curve_nurb_active_set(Curve *cu, Nurb *nu)
 {
 	if (nu == NULL) {
-		cu->actnu = -1;
+		cu->actnu = CU_ACT_NONE;
 	}
 	else {
 		ListBase *nurbs = BKE_curve_editNurbs_get(cu);
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index f5cfc28..20e5519 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -1926,7 +1926,7 @@ static void ed_curve_delete_selected(Object *obedit)
 				}
 				if (a == 0) {
 					if (cu->actnu == nuindex)
-						cu->actnu = -1;
+						cu->actnu = CU_ACT_NONE;
 
 					BLI_remlink(nubase, nu);
 					keyIndex_delNurb(editnurb, nu);
@@ -1950,7 +1950,7 @@ static void ed_curve_delete_selected(Object *obedit)
 				}
 				if (a == 0) {
 					if (cu->actnu == nuindex)
-						cu->actnu = -1;
+						cu->actnu = CU_ACT_NONE;
 
 					BLI_remlink(nubase, nu);
 					keyIndex_delNurb(editnurb, nu);
@@ -4939,7 +4939,7 @@ static int addvert_Nurb(bContext *C, short mode, float location[3])
 
 	if ((nu == NULL) || (nu->type == CU_BEZIER && bezt == NULL) || (nu->type != CU_BEZIER && bp == NULL)) {
 		if (mode != 'e') {
-			if (cu->actnu >= 0)
+			if (cu->actnu != CU_ACT_NONE)
 				nu = BLI_findlink(&editnurb->nurbs, cu->actnu);
 
 			if (!nu || nu->type == CU_BEZIER) {