[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34870] trunk/blender/source/blender/ editors/curve/editcurve.c: Fix #26087: in a curve, can' t make segment if Fkey was pressed 2 times before on a single vertex

[Sergey Sharybin]

Revision: 34870
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34870
Author:   nazgul
Date:     2011-02-15 16:09:53 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
Fix #26087: in a curve, can't make segment if Fkey was pressed 2 times before on a single vertex

- Disallow setting cyclic flag for single-point segment when this lonely
  segment is selected
- Clear cyclic flag for single-pointed segments when finding segments which
  can be merged

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/editcurve.c

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2011-02-15 15:37:40 UTC (rev 34869)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2011-02-15 16:09:53 UTC (rev 34870)
@@ -4001,6 +4001,9 @@
 	
 	/* find both nurbs and points, nu1 will be put behind nu2 */
 	for(nu= nubase->first; nu; nu= nu->next) {
+		if(nu->pntsu == 1)
+			nu->flagu&= ~CU_NURB_CYCLIC;
+
 		if((nu->flagu & CU_NURB_CYCLIC)==0) {    /* not cyclic */
 			if(nu->type == CU_BEZIER) {
 				if(nu1==0) {
@@ -4116,7 +4119,7 @@
 		ok= 1;
 	} else if(nu1 && !nu2 && nu1->type == CU_BEZIER) {
 		if(!(nu1->flagu & CU_NURB_CYCLIC)) {
-			if(BEZSELECTED_HIDDENHANDLES(cu, nu1->bezt) &&
+			if(nu1->pntsu>1 && BEZSELECTED_HIDDENHANDLES(cu, nu1->bezt) &&
 				BEZSELECTED_HIDDENHANDLES(cu, nu1->bezt+(nu1->pntsu-1))) {
 				nu1->flagu|= CU_NURB_CYCLIC;
 				calchandlesNurb(nu1);