[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59638] trunk/blender/source/blender: correct own error r59619 (changes made to patch, adding handle recalculation which is needed after splitting).

[Campbell Barton]

Revision: 59638
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59638
Author:   campbellbarton
Date:     2013-08-29 14:52:36 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
correct own error r59619 (changes made to patch, adding handle recalculation which is needed after splitting).

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59619

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/curve.c
    trunk/blender/source/blender/editors/space_text/text_ops.c

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2013-08-29 14:37:46 UTC (rev 59637)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2013-08-29 14:52:36 UTC (rev 59638)
@@ -3093,11 +3093,18 @@
 
 	BLI_assert(ARRAY_HAS_ITEM(bezt, nu->bezt, nu->pntsu));
 
-	if (index == 0) {
-		prev = (nu->flag & CU_NURB_CYCLIC) ? &nu->bezt[nu->pntsu - 1] : NULL;
+	if (nu->pntsu > 1) {
+		if (index == 0) {
+			prev = (nu->flagu & CU_NURB_CYCLIC) ? &nu->bezt[nu->pntsu - 1] : NULL;
+			next = bezt + 1;
+		}
+		else if (index == nu->pntsu - 1) {
+			prev = bezt - 1;
+			next = (nu->flagu & CU_NURB_CYCLIC) ? &nu->bezt[0] : NULL;
+		}
 	}
-	if (index == nu->pntsu - 1) {
-		next = (nu->flag & CU_NURB_CYCLIC) ? &nu->bezt[0] : NULL;
+	else {
+		prev = next = NULL;
 	}
 
 	BKE_nurb_handle_calc(bezt, prev, next, 0);

Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c	2013-08-29 14:37:46 UTC (rev 59637)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c	2013-08-29 14:52:36 UTC (rev 59638)
@@ -2086,7 +2086,7 @@
 
 static void txt_screen_clamp(SpaceText *st, ARegion *ar)
 {
-	if (st->top < 0) {
+	if (st->top <= 0) {
 		st->top = 0;
 	}
 	else {