Merging r46111 through r46136 from trunk into soc-2011-tomato
[blender-staging.git] / source / blender / editors / curve / editcurve.c
1 /*
2  * ***** BEGIN GPL LICENSE BLOCK *****
3  *
4  * This program is free software; you can redistribute it and/or
5  * modify it under the terms of the GNU General Public License
6  * as published by the Free Software Foundation; either version 2
7  * of the License, or (at your option) any later version.
8  *
9  * This program is distributed in the hope that it will be useful,
10  * but WITHOUT ANY WARRANTY; without even the implied warranty of
11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12  * GNU General Public License for more details.
13  *
14  * You should have received a copy of the GNU General Public License
15  * along with this program; if not, write to the Free Software Foundation,
16  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17  *
18  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
19  * All rights reserved.
20  *
21  * The Original Code is: all of this file.
22  *
23  * Contributor(s): none yet.
24  *
25  * ***** END GPL LICENSE BLOCK *****
26  */
27
28 /** \file blender/editors/curve/editcurve.c
29  *  \ingroup edcurve
30  */
31
32
33 #include <math.h>
34 #include <string.h>
35
36 #ifndef WIN32
37 #include <unistd.h>
38 #else
39 #include <io.h>
40 #endif
41 #include <stdlib.h>
42
43 #include "DNA_key_types.h"
44 #include "DNA_object_types.h"
45 #include "DNA_scene_types.h"
46 #include "DNA_anim_types.h"
47
48 #include "MEM_guardedalloc.h"
49
50 #include "BLI_blenlib.h"
51 #include "BLI_math.h"
52 #include "BLI_dynstr.h"
53 #include "BLI_rand.h"
54 #include "BLI_utildefines.h"
55 #include "BLI_ghash.h"
56
57 #include "BKE_context.h"
58 #include "BKE_curve.h"
59 #include "BKE_depsgraph.h"
60 #include "BKE_fcurve.h"
61 #include "BKE_global.h"
62 #include "BKE_key.h"
63 #include "BKE_library.h"
64 #include "BKE_main.h"
65 #include "BKE_report.h"
66 #include "BKE_animsys.h"
67 #include "BKE_action.h"
68
69 #include "WM_api.h"
70 #include "WM_types.h"
71
72 #include "ED_keyframes_edit.h"
73 #include "ED_object.h"
74 #include "ED_screen.h"
75 #include "ED_transform.h"
76 #include "ED_types.h"
77 #include "ED_util.h"
78 #include "ED_view3d.h"
79 #include "ED_curve.h"
80
81 #include "curve_intern.h"
82
83 #include "UI_interface.h"
84 #include "UI_resources.h"
85
86 #include "RNA_access.h"
87 #include "RNA_define.h"
88 #include "RNA_enum_types.h"
89
90 /* Undo stuff */
91 typedef struct {
92         ListBase nubase;
93         void *lastsel;
94         GHash *undoIndex;
95         ListBase fcurves, drivers;
96         int actnu;
97 } UndoCurve;
98
99 /* Definitions needed for shape keys */
100 typedef struct {
101         void *orig_cv;
102         int key_index, nu_index, pt_index;
103         int switched;
104         Nurb *orig_nu;
105 } CVKeyIndex;
106
107 void selectend_nurb(Object *obedit, short selfirst, short doswap, short selstatus);
108 static void select_adjacent_cp(ListBase *editnurb, short next, short cont, short selstatus);
109
110 /* still need to eradicate a few :( */
111 #define callocstructN(x, y, name) (x*)MEM_callocN((y)* sizeof(x), name)
112
113 static float nurbcircle[8][2]= {
114         {0.0, -1.0}, {-1.0, -1.0}, {-1.0, 0.0}, {-1.0,  1.0},
115         {0.0,  1.0}, { 1.0,  1.0}, { 1.0, 0.0}, { 1.0, -1.0}
116 };
117
118 ListBase *object_editcurve_get(Object *ob)
119 {
120         if (ob && ELEM(ob->type, OB_CURVE, OB_SURF)) {
121                 Curve *cu= ob->data;
122                 return &cu->editnurb->nurbs;
123         }
124         return NULL;
125 }
126
127 /* this replaces the active flag used in uv/face mode */
128 static void set_actNurb(Object *obedit, Nurb *nu)
129 {
130         Curve *cu= obedit->data;
131         
132         if (nu==NULL)
133                 cu->actnu = -1;
134         else {
135                 ListBase *nurbs= BKE_curve_editNurbs_get(cu);
136                 cu->actnu = BLI_findindex(nurbs, nu);
137         }
138 }
139
140 static Nurb *get_actNurb(Object *obedit)
141 {
142         Curve *cu= obedit->data;
143         ListBase *nurbs= BKE_curve_editNurbs_get(cu);
144
145         return BLI_findlink(nurbs, cu->actnu);
146 }
147
148 /* ******************* SELECTION FUNCTIONS ********************* */
149
150 #define HIDDEN                  1
151 #define VISIBLE                 0
152
153 #define FIRST                   1
154 #define LAST                    0
155
156
157 /* returns 1 in case (de)selection was successful */
158 static short select_beztriple(BezTriple *bezt, short selstatus, short flag, short hidden)
159 {       
160         if (bezt) {
161                 if ((bezt->hide==0) || (hidden==1)) {
162                         if (selstatus==1) { /* selects */                       
163                                 bezt->f1 |= flag;
164                                 bezt->f2 |= flag;
165                                 bezt->f3 |= flag;
166                                 return 1;                       
167                         }
168                         else { /* deselects */  
169                                 bezt->f1 &= ~flag; 
170                                 bezt->f2 &= ~flag; 
171                                 bezt->f3 &= ~flag; 
172                                 return 1;
173                         }
174                 }
175         }
176         
177         return 0;
178 }
179
180 /* returns 1 in case (de)selection was successful */
181 static short select_bpoint(BPoint *bp, short selstatus, short flag, short hidden) 
182 {       
183         if (bp) {
184                 if ((bp->hide==0) || (hidden==1)) {
185                         if (selstatus==1) {
186                                 bp->f1 |= flag;
187                                 return 1;
188                         }
189                         else {
190                                 bp->f1 &= ~flag;
191                                 return 1;
192                         }
193                 }
194         }
195
196         return 0;
197 }
198
199 static short swap_selection_beztriple(BezTriple *bezt)
200 {
201         if (bezt->f2 & SELECT)
202                 return select_beztriple(bezt, DESELECT, 1, VISIBLE);
203         else
204                 return select_beztriple(bezt, SELECT, 1, VISIBLE);
205 }
206
207 static short swap_selection_bpoint(BPoint *bp)
208 {
209         if (bp->f1 & SELECT)
210                 return select_bpoint(bp, DESELECT, 1, VISIBLE);
211         else
212                 return select_bpoint(bp, SELECT, 1, VISIBLE);
213 }
214
215 int isNurbsel(Nurb *nu)
216 {
217         BezTriple *bezt;
218         BPoint *bp;
219         int a;
220
221         if (nu->type == CU_BEZIER) {
222                 bezt= nu->bezt;
223                 a= nu->pntsu;
224                 while (a--) {
225                         if ( (bezt->f1 & SELECT) || (bezt->f2 & SELECT) || (bezt->f3 & SELECT) ) return 1;
226                         bezt++;
227                 }
228         }
229         else {
230                 bp= nu->bp;
231                 a= nu->pntsu*nu->pntsv;
232                 while (a--) {
233                         if ( (bp->f1 & SELECT) ) return 1;
234                         bp++;
235                 }
236         }
237         return 0;
238 }
239
240 static int isNurbsel_count(Curve *cu, Nurb *nu)
241 {
242         BezTriple *bezt;
243         BPoint *bp;
244         int a, sel=0;
245
246         if (nu->type == CU_BEZIER) {
247                 bezt= nu->bezt;
248                 a= nu->pntsu;
249                 while (a--) {
250                         if (BEZSELECTED_HIDDENHANDLES(cu, bezt)) sel++;
251                         bezt++;
252                 }
253         }
254         else {
255                 bp= nu->bp;
256                 a= nu->pntsu*nu->pntsv;
257                 while (a--) {
258                         if ( (bp->f1 & SELECT) ) sel++;
259                         bp++;
260                 }
261         }
262         return sel;
263 }
264
265 /* ******************* PRINTS ********************* */
266
267 void printknots(Object *obedit)
268 {
269         ListBase *editnurb= object_editcurve_get(obedit);
270         Nurb *nu;
271         int a, num;
272
273         for (nu= editnurb->first; nu; nu= nu->next) {
274                 if (isNurbsel(nu) &&  nu->type == CU_NURBS) {
275                         if (nu->knotsu) {
276                                 num= KNOTSU(nu);
277                                 for (a=0;a<num;a++) printf("knotu %d: %f\n", a, nu->knotsu[a]);
278                         }
279                         if (nu->knotsv) {
280                                 num= KNOTSV(nu);
281                                 for (a=0;a<num;a++) printf("knotv %d: %f\n", a, nu->knotsv[a]);
282                         }
283                 }
284         }
285 }
286
287 /* ********************* Shape keys *************** */
288
289 static CVKeyIndex *init_cvKeyIndex(void *cv, int key_index, int nu_index, int pt_index, Nurb *orig_nu)
290 {
291         CVKeyIndex *cvIndex = MEM_callocN(sizeof(CVKeyIndex), "init_cvKeyIndex");
292
293         cvIndex->orig_cv= cv;
294         cvIndex->key_index= key_index;
295         cvIndex->nu_index= nu_index;
296         cvIndex->pt_index= pt_index;
297         cvIndex->switched= 0;
298         cvIndex->orig_nu= orig_nu;
299
300         return cvIndex;
301 }
302
303 static void init_editNurb_keyIndex(EditNurb *editnurb, ListBase *origBase)
304 {
305         Nurb *nu= editnurb->nurbs.first;
306         Nurb *orignu= origBase->first;
307         GHash *gh;
308         BezTriple *bezt, *origbezt;
309         BPoint *bp, *origbp;
310         CVKeyIndex *keyIndex;
311         int a, key_index= 0, nu_index= 0, pt_index= 0;
312
313         if (editnurb->keyindex) return;
314
315         gh= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "editNurb keyIndex");
316
317         while (orignu) {
318                 if (orignu->bezt) {
319                         a= orignu->pntsu;
320                         bezt= nu->bezt;
321                         origbezt= orignu->bezt;
322                         pt_index= 0;
323                         while (a--) {
324                                 keyIndex= init_cvKeyIndex(origbezt, key_index, nu_index, pt_index, orignu);
325                                 BLI_ghash_insert(gh, bezt, keyIndex);
326                                 key_index+= 12;
327                                 bezt++;
328                                 origbezt++;
329                                 pt_index++;
330                         }
331                 }
332                 else {
333                         a= orignu->pntsu * orignu->pntsv;
334                         bp= nu->bp;
335                         origbp= orignu->bp;
336                         pt_index= 0;
337                         while (a--) {
338                                 keyIndex= init_cvKeyIndex(origbp, key_index, nu_index, pt_index, orignu);
339                                 BLI_ghash_insert(gh, bp, keyIndex);
340                                 key_index+= 4;
341                                 bp++;
342                                 origbp++;
343                                 pt_index++;
344                         }
345                 }
346
347                 nu= nu->next;
348                 orignu= orignu->next;
349                 nu_index++;
350         }
351
352         editnurb->keyindex= gh;
353 }
354
355 static CVKeyIndex *getCVKeyIndex(EditNurb *editnurb, void *cv)
356 {
357         return BLI_ghash_lookup(editnurb->keyindex, cv);
358 }
359
360 static BezTriple *getKeyIndexOrig_bezt(EditNurb *editnurb, BezTriple *bezt)
361 {
362         CVKeyIndex *index= getCVKeyIndex(editnurb, bezt);
363
364         if (!index) {
365                 return NULL;
366         }
367
368         return (BezTriple*)index->orig_cv;
369 }
370
371 static BPoint *getKeyIndexOrig_bp(EditNurb *editnurb, BPoint *bp)
372 {
373         CVKeyIndex *index= getCVKeyIndex(editnurb, bp);
374
375         if (!index) {
376                 return NULL;
377         }
378
379         return (BPoint*)index->orig_cv;
380 }
381
382 static int getKeyIndexOrig_keyIndex(EditNurb *editnurb, void *cv)
383 {
384         CVKeyIndex *index= getCVKeyIndex(editnurb, cv);
385
386         if (!index) {
387                 return -1;
388         }
389
390         return index->key_index;
391 }
392
393 static void keyIndex_delCV(EditNurb *editnurb, void *cv)
394 {
395         if (!editnurb->keyindex) {
396                 return;
397         }
398
399         BLI_ghash_remove(editnurb->keyindex, cv, NULL, (GHashValFreeFP)MEM_freeN);
400 }
401
402 static void keyIndex_delBezt(EditNurb *editnurb, BezTriple *bezt)
403 {
404         keyIndex_delCV(editnurb, bezt);
405 }
406
407 static void keyIndex_delBP(EditNurb *editnurb, BPoint *bp)
408 {
409         keyIndex_delCV(editnurb, bp);
410 }
411
412 static void keyIndex_delNurb(EditNurb *editnurb, Nurb *nu)
413 {
414         int a;
415
416         if (!editnurb->keyindex) {
417                 return;
418         }
419
420         if (nu->bezt) {
421                 BezTriple *bezt= nu->bezt;
422                 a= nu->pntsu;
423
424                 while (a--) {
425                         BLI_ghash_remove(editnurb->keyindex, bezt, NULL, (GHashValFreeFP)MEM_freeN);
426                         ++bezt;
427                 }
428         }
429         else {
430                 BPoint *bp= nu->bp;
431                 a= nu->pntsu * nu->pntsv;
432
433                 while (a--) {
434                         BLI_ghash_remove(editnurb->keyindex, bp, NULL, (GHashValFreeFP)MEM_freeN);
435                         ++bp;
436                 }
437         }
438 }
439
440 static void keyIndex_delNurbList(EditNurb *editnurb, ListBase *nubase)
441 {
442         Nurb *nu= nubase->first;
443
444         while (nu) {
445                 keyIndex_delNurb(editnurb, nu);
446
447                 nu= nu->next;
448         }
449 }
450
451 static void keyIndex_updateCV(EditNurb *editnurb, char *cv,
452         char *newcv, int count, int size)
453 {
454         int i;
455         CVKeyIndex *index;
456
457         if (editnurb->keyindex == NULL) {
458                 /* No shape keys - updating not needed */
459                 return;
460         }
461
462         for (i = 0; i < count; i++) {
463                 index= getCVKeyIndex(editnurb, cv);
464
465                 BLI_ghash_remove(editnurb->keyindex, cv, NULL, NULL);
466
467                 if (index) {
468                         BLI_ghash_insert(editnurb->keyindex, newcv, index);
469                 }
470
471                 newcv += size;
472                 cv += size;
473         }
474 }
475
476 static void keyIndex_updateBezt(EditNurb *editnurb, BezTriple *bezt,
477         BezTriple *newbezt, int count)
478 {
479         keyIndex_updateCV(editnurb, (char*)bezt, (char*)newbezt, count, sizeof(BezTriple));
480 }
481
482 static void keyIndex_updateBP(EditNurb *editnurb, BPoint *bp,
483         BPoint *newbp, int count)
484 {
485         keyIndex_updateCV(editnurb, (char*)bp, (char*)newbp, count, sizeof(BPoint));
486 }
487
488 static void keyIndex_updateNurb(EditNurb *editnurb, Nurb *nu, Nurb *newnu)
489 {
490         if (nu->bezt) {
491                 keyIndex_updateBezt(editnurb, nu->bezt, newnu->bezt, newnu->pntsu);
492         }
493         else {
494                 keyIndex_updateBP(editnurb, nu->bp, newnu->bp, newnu->pntsu * newnu->pntsv);
495         }
496 }
497
498 static void keyIndex_swap(EditNurb *editnurb, void *a, void *b)
499 {
500         CVKeyIndex *index1= getCVKeyIndex(editnurb, a);
501         CVKeyIndex *index2= getCVKeyIndex(editnurb, b);
502
503         BLI_ghash_remove(editnurb->keyindex, a, NULL, NULL);
504         BLI_ghash_remove(editnurb->keyindex, b, NULL, NULL);
505
506         if (index2) BLI_ghash_insert(editnurb->keyindex, a, index2);
507         if (index1) BLI_ghash_insert(editnurb->keyindex, b, index1);
508 }
509
510 static void keyIndex_switchDirection(EditNurb *editnurb, Nurb *nu)
511 {
512         int a;
513         CVKeyIndex *index1, *index2;
514
515         if (nu->bezt) {
516                 BezTriple *bezt1, *bezt2;
517
518                 a= nu->pntsu;
519
520                 bezt1= nu->bezt;
521                 bezt2= bezt1+(a-1);
522
523                 if (a & 1) ++a;
524
525                 a/=2;
526
527                 while (a--) {
528                         index1= getCVKeyIndex(editnurb, bezt1);
529                         index2= getCVKeyIndex(editnurb, bezt2);
530
531                         if (index1) index1->switched= !index1->switched;
532
533                         if (bezt1 != bezt2) {
534                                 keyIndex_swap(editnurb, bezt1, bezt2);
535
536                                 if (index2) index2->switched= !index2->switched;
537                         }
538
539                         bezt1++;
540                         bezt2--;
541                 }
542         }
543         else {
544                 BPoint *bp1, *bp2;
545
546                 if (nu->pntsv == 1) {
547                         a= nu->pntsu;
548                         bp1= nu->bp;
549                         bp2= bp1+(a-1);
550                         a/= 2;
551                         while (bp1!=bp2 && a>0) {
552                                 index1= getCVKeyIndex(editnurb, bp1);
553                                 index2= getCVKeyIndex(editnurb, bp2);
554
555                                 if (index1) index1->switched= !index1->switched;
556
557                                 if (bp1 != bp2) {
558                                         if (index2) index2->switched= !index2->switched;
559
560                                         keyIndex_swap(editnurb, bp1, bp2);
561                                 }
562
563                                 a--;
564                                 bp1++;
565                                 bp2--;
566                         }
567                 }
568                 else {
569                         int b;
570
571                         for (b=0; b<nu->pntsv; b++) {
572
573                                 bp1= nu->bp+b*nu->pntsu;
574                                 a= nu->pntsu;
575                                 bp2= bp1+(a-1);
576                                 a/= 2;
577
578                                 while (bp1!=bp2 && a>0) {
579                                         index1= getCVKeyIndex(editnurb, bp1);
580                                         index2= getCVKeyIndex(editnurb, bp2);
581
582                                         if (index1) index1->switched= !index1->switched;
583
584                                         if (bp1 != bp2) {
585                                                 if (index2) index2->switched= !index2->switched;
586
587                                                 keyIndex_swap(editnurb, bp1, bp2);
588                                         }
589
590                                         a--;
591                                         bp1++;
592                                         bp2--;
593                                 }
594                         }
595
596                 }
597         }
598 }
599
600 static void switch_keys_direction(Curve *cu, Nurb *actnu)
601 {
602         KeyBlock *currkey;
603         EditNurb *editnurb= cu->editnurb;
604         ListBase *nubase= &editnurb->nurbs;
605         Nurb *nu;
606         float *fp;
607         int a;
608
609         currkey = cu->key->block.first;
610         while (currkey) {
611                 fp= currkey->data;
612
613                 nu= nubase->first;
614                 while (nu) {
615                         if (nu->bezt) {
616                                 BezTriple *bezt= nu->bezt;
617                                 a= nu->pntsu;
618                                 if (nu == actnu) {
619                                         while (a--) {
620                                                 if (getKeyIndexOrig_bezt(editnurb, bezt)) {
621                                                         swap_v3_v3(fp, fp + 6);
622                                                         *(fp+9) = -*(fp+9);
623                                                         fp += 12;
624                                                 }
625                                                 bezt++;
626                                         }
627                                 }
628                                 else fp += a * 12;
629                         }
630                         else {
631                                 BPoint *bp= nu->bp;
632                                 a= nu->pntsu * nu->pntsv;
633                                 if (nu == actnu) {
634                                         while (a--) {
635                                                 if (getKeyIndexOrig_bp(editnurb, bp)) {
636                                                         *(fp+3) = -*(fp+3);
637                                                         fp += 4;
638                                                 }
639                                                 bp++;
640                                         }
641                                 }
642                                 else fp += a * 4;
643                         }
644
645                         nu= nu->next;
646                 }
647
648                 currkey= currkey->next;
649         }
650 }
651
652 static void keyData_switchDirectionNurb(Curve *cu, Nurb *nu)
653 {
654         EditNurb *editnurb= cu->editnurb;
655
656         if (!editnurb->keyindex) {
657                 /* no shape keys - nothing to do */
658                 return;
659         }
660
661         keyIndex_switchDirection(editnurb, nu);
662         if (cu->key)
663                 switch_keys_direction(cu, nu);
664 }
665
666 static GHash *dupli_keyIndexHash(GHash *keyindex)
667 {
668         GHash *gh;
669         GHashIterator *hashIter;
670
671         gh= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "dupli_keyIndex gh");
672
673         for (hashIter = BLI_ghashIterator_new(keyindex);
674                                    !BLI_ghashIterator_isDone(hashIter);
675                                    BLI_ghashIterator_step(hashIter)) {
676                 void *cv = BLI_ghashIterator_getKey(hashIter);
677                 CVKeyIndex *index = BLI_ghashIterator_getValue(hashIter);
678                 CVKeyIndex *newIndex = MEM_callocN(sizeof(CVKeyIndex), "dupli_keyIndexHash index");
679
680                 memcpy(newIndex, index, sizeof(CVKeyIndex));
681
682                 BLI_ghash_insert(gh, cv, newIndex);
683         }
684
685         BLI_ghashIterator_free(hashIter);
686
687         return gh;
688 }
689
690 static void key_to_bezt(float *key, BezTriple *basebezt, BezTriple *bezt)
691 {
692         memcpy(bezt, basebezt, sizeof(BezTriple));
693         memcpy(bezt->vec, key, sizeof(float) * 9);
694         bezt->alfa= key[9];
695 }
696
697 static void bezt_to_key(BezTriple *bezt, float *key)
698 {
699         memcpy(key, bezt->vec, sizeof(float) * 9);
700         key[9] = bezt->alfa;
701 }
702
703 static void calc_keyHandles(ListBase *nurb, float *key)
704 {
705         Nurb *nu;
706         int a;
707         float *fp= key;
708         BezTriple *bezt;
709
710         nu= nurb->first;
711         while (nu) {
712                 if (nu->bezt) {
713                         BezTriple *prevp, *nextp;
714                         BezTriple cur, prev, next;
715                         float *startfp, *prevfp, *nextfp;
716
717                         bezt= nu->bezt;
718                         a= nu->pntsu;
719                         startfp= fp;
720
721                         if (nu->flagu & CU_NURB_CYCLIC) {
722                                 prevp= bezt+(a-1);
723                                 prevfp= fp+(12 * (a-1));
724                         }
725                         else {
726                                 prevp= NULL;
727                                 prevfp= NULL;
728                         }
729
730                         nextp= bezt + 1;
731                         nextfp= fp + 12;
732
733                         while (a--) {
734                                 key_to_bezt(fp, bezt, &cur);
735
736                                 if (nextp) key_to_bezt(nextfp, nextp, &next);
737                                 if (prevp) key_to_bezt(prevfp, prevp, &prev);
738
739                                 BKE_nurb_handle_calc(&cur, prevp ? &prev : NULL, nextp ? &next : NULL, 0);
740                                 bezt_to_key(&cur, fp);
741
742                                 prevp= bezt;
743                                 prevfp= fp;
744                                 if (a==1) {
745                                         if (nu->flagu & CU_NURB_CYCLIC) {
746                                                 nextp= nu->bezt;
747                                                 nextfp= startfp;
748                                         }
749                                         else {
750                                                 nextp= NULL;
751                                                 nextfp= NULL;
752                                         }
753                                 }
754                                 else {
755                                         ++nextp;
756                                         nextfp += 12;
757                                 }
758
759                                 ++bezt;
760                                 fp += 12;
761                         }
762                 }
763                 else {
764                         a= nu->pntsu * nu->pntsv;
765                         fp += a * 4;
766                 }
767
768                 nu= nu->next;
769         }
770 }
771
772 static void calc_shapeKeys(Object *obedit)
773 {
774         Curve *cu= (Curve*)obedit->data;
775
776         /* are there keys? */
777         if (cu->key) {
778                 int a, i;
779                 EditNurb *editnurb= cu->editnurb;
780                 KeyBlock *currkey;
781                 KeyBlock *actkey= BLI_findlink(&cu->key->block, editnurb->shapenr-1);
782                 BezTriple *bezt, *oldbezt;
783                 BPoint *bp, *oldbp;
784                 Nurb *nu;
785                 int totvert= BKE_nurbList_verts_count(&editnurb->nurbs);
786
787                 float (*ofs)[3] = NULL;
788                 float *oldkey, *newkey, *ofp;
789
790                 /* editing the base key should update others */
791                 if (cu->key->type==KEY_RELATIVE) {
792                         int act_is_basis = 0;
793                         /* find if this key is a basis for any others */
794                         for (currkey = cu->key->block.first; currkey; currkey= currkey->next) {
795                                 if (editnurb->shapenr-1 == currkey->relative) {
796                                         act_is_basis = 1;
797                                         break;
798                                 }
799                         }
800
801                         if (act_is_basis) { /* active key is a base */
802                                 int totvec= 0;
803
804                                 /* Calculate needed memory to store offset */
805                                 nu= editnurb->nurbs.first;
806                                 while (nu) {
807                                         if (nu->bezt) {
808                                                 /* Three vects to store handles and one for alfa */
809                                                 totvec+= nu->pntsu * 4;
810                                         }
811                                         else {
812                                                 totvec+= 2 * nu->pntsu * nu->pntsv;
813                                         }
814
815                                         nu= nu->next;
816                                 }
817
818                                 ofs= MEM_callocN(sizeof(float) * 3 * totvec,  "currkey->data");
819                                 nu= editnurb->nurbs.first;
820                                 i= 0;
821                                 while (nu) {
822                                         if (nu->bezt) {
823                                                 bezt= nu->bezt;
824                                                 a= nu->pntsu;
825                                                 while (a--) {
826                                                         oldbezt= getKeyIndexOrig_bezt(editnurb, bezt);
827
828                                                         if (oldbezt) {
829                                                                 int j;
830                                                                 for (j= 0; j < 3; ++j) {
831                                                                         sub_v3_v3v3(ofs[i], bezt->vec[j], oldbezt->vec[j]);
832                                                                         i++;
833                                                                 }
834                                                                 ofs[i++][0]= bezt->alfa - oldbezt->alfa;
835                                                         }
836                                                         else {
837                                                                 i += 4;
838                                                         }
839                                                         bezt++;
840                                                 }
841                                         }
842                                         else {
843                                                 bp= nu->bp;
844                                                 a= nu->pntsu*nu->pntsv;
845                                                 while (a--) {
846                                                         oldbp= getKeyIndexOrig_bp(editnurb, bp);
847                                                         if (oldbp) {
848                                                                 sub_v3_v3v3(ofs[i], bp->vec, oldbp->vec);
849                                                                 ofs[i+1][0]= bp->alfa - oldbp->alfa;
850                                                         }
851                                                         i += 2;
852                                                         ++bp;
853                                                 }
854                                         }
855
856                                         nu= nu->next;
857                                 }
858                         }
859                 }
860
861                 currkey = cu->key->block.first;
862                 while (currkey) {
863                         int apply_offset = (ofs && (currkey != actkey) && (editnurb->shapenr-1 == currkey->relative));
864
865                         float *fp= newkey= MEM_callocN(cu->key->elemsize * totvert,  "currkey->data");
866                         ofp= oldkey = currkey->data;
867
868                         nu= editnurb->nurbs.first;
869                         i = 0;
870                         while (nu) {
871                                 if (currkey == actkey) {
872                                         int restore= actkey != cu->key->refkey;
873
874                                         if (nu->bezt) {
875                                                 bezt= nu->bezt;
876                                                 a= nu->pntsu;
877                                                 while (a--) {
878                                                         int j;
879                                                         oldbezt= getKeyIndexOrig_bezt(editnurb, bezt);
880
881                                                         for (j= 0; j < 3; ++j, ++i) {
882                                                                 copy_v3_v3(fp, bezt->vec[j]);
883
884                                                                 if (restore && oldbezt) {
885                                                                         copy_v3_v3(bezt->vec[j], oldbezt->vec[j]);
886                                                                 }
887
888                                                                 fp+= 3;
889                                                         }
890                                                         fp[0]= bezt->alfa;
891
892                                                         if (restore && oldbezt) {
893                                                                 bezt->alfa= oldbezt->alfa;
894                                                         }
895
896                                                         fp+= 3; ++i;/* alphas */
897                                                         ++bezt;
898                                                 }
899                                         }
900                                         else {
901                                                 bp= nu->bp;
902                                                 a= nu->pntsu*nu->pntsv;
903                                                 while (a--) {
904                                                         oldbp= getKeyIndexOrig_bp(editnurb, bp);
905
906                                                         copy_v3_v3(fp, bp->vec);
907
908                                                         fp[3]= bp->alfa;
909
910                                                         if (restore && oldbp) {
911                                                                 copy_v3_v3(bp->vec, oldbp->vec);
912                                                                 bp->alfa= oldbp->alfa;
913                                                         }
914
915                                                         fp+= 4;
916                                                         ++bp;
917                                                         i+=2;
918                                                 }
919                                         }
920                                 }
921                                 else {
922                                         int index;
923                                         float *curofp;
924
925                                         if (oldkey) {
926                                                 if (nu->bezt) {
927                                                         bezt= nu->bezt;
928                                                         a= nu->pntsu;
929
930                                                         while (a--) {
931                                                                 index= getKeyIndexOrig_keyIndex(editnurb, bezt);
932                                                                 if (index >= 0) {
933                                                                         int j;
934                                                                         curofp= ofp + index;
935
936                                                                         for (j= 0; j < 3; ++j, ++i) {
937                                                                                 copy_v3_v3(fp, curofp);
938
939                                                                                 if (apply_offset) {
940                                                                                         add_v3_v3(fp, ofs[i]);
941                                                                                 }
942
943                                                                                 fp+= 3; curofp+= 3;
944                                                                         }
945                                                                         fp[0]= curofp[0];
946
947                                                                         if (apply_offset) {
948                                                                                 /* apply alfa offsets */
949                                                                                 add_v3_v3(fp, ofs[i]);
950                                                                                 ++i;
951                                                                         }
952
953                                                                         fp+= 3; /* alphas */
954                                                                 }
955                                                                 else {
956                                                                         int j;
957                                                                         for (j= 0; j < 3; ++j, ++i) {
958                                                                                 copy_v3_v3(fp, bezt->vec[j]);
959                                                                                 fp+= 3;
960                                                                         }
961                                                                         fp[0]= bezt->alfa;
962
963                                                                         fp+= 3; /* alphas */
964                                                                 }
965                                                                 ++bezt;
966                                                         }
967                                                 }
968                                                 else {
969                                                         bp= nu->bp;
970                                                         a= nu->pntsu*nu->pntsv;
971                                                         while (a--) {
972                                                                 index= getKeyIndexOrig_keyIndex(editnurb, bp);
973
974                                                                 if (index >= 0) {
975                                                                         curofp= ofp + index;
976                                                                         copy_v3_v3(fp, curofp);
977                                                                         fp[3]= curofp[3];
978
979                                                                         if (apply_offset) {
980                                                                                 add_v3_v3(fp, ofs[i]);
981                                                                                 fp[3]+=ofs[i+1][0];
982                                                                         }
983                                                                 }
984                                                                 else {
985                                                                         copy_v3_v3(fp, bp->vec);
986                                                                         fp[3]= bp->alfa;
987                                                                 }
988
989                                                                 fp+= 4;
990                                                                 ++bp;
991                                                                 i+=2;
992                                                         }
993                                                 }
994                                         }
995                                 }
996
997                                 nu= nu->next;
998                         }
999
1000                         if (apply_offset) {
1001                                 /* handles could become malicious after offsets applying */
1002                                 calc_keyHandles(&editnurb->nurbs, newkey);
1003                         }
1004
1005                         currkey->totelem= totvert;
1006                         if (currkey->data) MEM_freeN(currkey->data);
1007                         currkey->data = newkey;
1008
1009                         currkey= currkey->next;
1010                 }
1011
1012                 if (ofs) MEM_freeN(ofs);
1013         }
1014 }
1015
1016 /* ********************* Amimation data *************** */
1017
1018 static int curve_is_animated(Curve *cu)
1019 {
1020         AnimData *ad= BKE_animdata_from_id(&cu->id);
1021
1022         return ad && (ad->action || ad->drivers.first);
1023 }
1024
1025 static void fcurve_path_rename(AnimData *ad, char *orig_rna_path, char *rna_path, ListBase *orig_curves, ListBase *curves)
1026 {
1027         FCurve *fcu, *nfcu, *nextfcu;
1028         int len= strlen(orig_rna_path);
1029
1030         fcu= orig_curves->first;
1031         while (fcu) {
1032                 nextfcu= fcu->next;
1033                 if (!strncmp(fcu->rna_path, orig_rna_path, len)) {
1034                         char *spath, *suffix= fcu->rna_path + len;
1035                         nfcu= copy_fcurve(fcu);
1036                         spath= nfcu->rna_path;
1037                         nfcu->rna_path= BLI_sprintfN("%s%s", rna_path, suffix);
1038                         BLI_addtail(curves, nfcu);
1039
1040                         if (fcu->grp) {
1041                                 action_groups_remove_channel(ad->action, fcu);
1042                                 action_groups_add_channel(ad->action, fcu->grp, nfcu);
1043                         }
1044                         else if (ad->action && &ad->action->curves == orig_curves)
1045                                 BLI_remlink(&ad->action->curves, fcu);
1046                         else
1047                                 BLI_remlink(&ad->drivers, fcu);
1048
1049                         free_fcurve(fcu);
1050
1051                         MEM_freeN(spath);
1052                 }
1053                 fcu= nextfcu;
1054         }
1055 }
1056
1057 static void fcurve_remove(AnimData *ad, ListBase *orig_curves, FCurve *fcu)
1058 {
1059         if (orig_curves==&ad->drivers) BLI_remlink(&ad->drivers, fcu);
1060         else action_groups_remove_channel(ad->action, fcu);
1061
1062         free_fcurve(fcu);
1063 }
1064
1065 static void curve_rename_fcurves(Curve *cu, ListBase *orig_curves)
1066 {
1067         int nu_index= 0, a, pt_index;
1068         EditNurb *editnurb= cu->editnurb;
1069         Nurb *nu= editnurb->nurbs.first;
1070         CVKeyIndex *keyIndex;
1071         char rna_path[64], orig_rna_path[64];
1072         AnimData *ad= BKE_animdata_from_id(&cu->id);
1073         ListBase curves= {NULL, NULL};
1074         FCurve *fcu, *next;
1075
1076         while (nu) {
1077                 if (nu->bezt) {
1078                         BezTriple *bezt= nu->bezt;
1079                         a= nu->pntsu;
1080                         pt_index= 0;
1081
1082                         while (a--) {
1083                                 keyIndex= getCVKeyIndex(editnurb, bezt);
1084                                 if (keyIndex) {
1085                                         BLI_snprintf(rna_path, sizeof(rna_path), "splines[%d].bezier_points[%d]", nu_index, pt_index);
1086                                         BLI_snprintf(orig_rna_path, sizeof(orig_rna_path), "splines[%d].bezier_points[%d]", keyIndex->nu_index, keyIndex->pt_index);
1087
1088                                         if (keyIndex->switched) {
1089                                                 char handle_path[64], orig_handle_path[64];
1090                                                 BLI_snprintf(orig_handle_path, sizeof(orig_rna_path), "%s.handle_left", orig_rna_path);
1091                                                 BLI_snprintf(handle_path, sizeof(rna_path), "%s.handle_right", rna_path);
1092                                                 fcurve_path_rename(ad, orig_handle_path, handle_path, orig_curves, &curves);
1093
1094                                                 BLI_snprintf(orig_handle_path, sizeof(orig_rna_path), "%s.handle_right", orig_rna_path);
1095                                                 BLI_snprintf(handle_path, sizeof(rna_path), "%s.handle_left", rna_path);
1096                                                 fcurve_path_rename(ad, orig_handle_path, handle_path, orig_curves, &curves);
1097                                         }
1098
1099                                         fcurve_path_rename(ad, orig_rna_path, rna_path, orig_curves, &curves);
1100
1101                                         keyIndex->nu_index= nu_index;
1102                                         keyIndex->pt_index= pt_index;
1103                                 }
1104
1105                                 bezt++;
1106                                 pt_index++;
1107                         }
1108                 }
1109                 else {
1110                         BPoint *bp= nu->bp;
1111                         a= nu->pntsu * nu->pntsv;
1112                         pt_index= 0;
1113
1114                         while (a--) {
1115                                 keyIndex= getCVKeyIndex(editnurb, bp);
1116                                 if (keyIndex) {
1117                                         BLI_snprintf(rna_path, sizeof(rna_path), "splines[%d].points[%d]", nu_index, pt_index);
1118                                         BLI_snprintf(orig_rna_path, sizeof(orig_rna_path), "splines[%d].points[%d]", keyIndex->nu_index, keyIndex->pt_index);
1119                                         fcurve_path_rename(ad, orig_rna_path, rna_path, orig_curves, &curves);
1120
1121                                         keyIndex->nu_index= nu_index;
1122                                         keyIndex->pt_index= pt_index;
1123                                 }
1124
1125                                 bp++;
1126                                 pt_index++;
1127                         }
1128                 }
1129                 nu= nu->next;
1130                 nu_index++;
1131         }
1132
1133         /* remove paths for removed control points
1134          * need this to make further step with copying non-cv related curves copying
1135          * not touching cv's f-curves */
1136         for (fcu= orig_curves->first; fcu; fcu= next) {
1137                 next= fcu->next;
1138
1139                 if (!strncmp(fcu->rna_path, "splines", 7)) {
1140                         char *ch= strchr(fcu->rna_path, '.');
1141
1142                         if (ch && (!strncmp(ch, ".bezier_points", 14) || !strncmp(ch, ".points", 7)))
1143                                 fcurve_remove(ad, orig_curves, fcu);
1144                 }
1145         }
1146
1147         nu_index= 0;
1148         nu= editnurb->nurbs.first;
1149         while (nu) {
1150                 keyIndex= NULL;
1151                 if (nu->pntsu) {
1152                         if (nu->bezt) keyIndex= getCVKeyIndex(editnurb, &nu->bezt[0]);
1153                         else keyIndex= getCVKeyIndex(editnurb, &nu->bp[0]);
1154                 }
1155
1156                 if (keyIndex) {
1157                         BLI_snprintf(rna_path, sizeof(rna_path), "splines[%d]", nu_index);
1158                         BLI_snprintf(orig_rna_path, sizeof(orig_rna_path), "splines[%d]", keyIndex->nu_index);
1159                         fcurve_path_rename(ad, orig_rna_path, rna_path, orig_curves, &curves);
1160                 }
1161
1162                 nu_index++;
1163                 nu= nu->next;
1164         }
1165
1166         /* the remainders in orig_curves can be copied back (like follow path) */
1167         /* (if it's not path to spline) */
1168         for (fcu= orig_curves->first; fcu; fcu= next) {
1169                 next= fcu->next;
1170
1171                 if (!strncmp(fcu->rna_path, "splines", 7)) fcurve_remove(ad, orig_curves, fcu);
1172                 else BLI_addtail(&curves, fcu);
1173         }
1174
1175         *orig_curves= curves;
1176 }
1177
1178 /* return 0 if animation data wasn't changed, 1 otherwise */
1179 int ED_curve_updateAnimPaths(Curve *cu)
1180 {
1181         AnimData *ad= BKE_animdata_from_id(&cu->id);
1182
1183         if (!curve_is_animated(cu)) return 0;
1184
1185         if (ad->action)
1186                 curve_rename_fcurves(cu, &ad->action->curves);
1187
1188         curve_rename_fcurves(cu, &ad->drivers);
1189
1190         return 1;
1191 }
1192
1193 /* ********************* LOAD and MAKE *************** */
1194
1195 /* load editNurb in object */
1196 void load_editNurb(Object *obedit)
1197 {
1198         ListBase *editnurb= object_editcurve_get(obedit);
1199
1200         if (obedit==NULL) return;
1201
1202         set_actNurb(obedit, NULL);
1203
1204         if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
1205                 Curve *cu= obedit->data;
1206                 Nurb *nu, *newnu;
1207                 ListBase newnurb= {NULL, NULL}, oldnurb= cu->nurb;
1208
1209                 for (nu= editnurb->first; nu; nu= nu->next) {
1210                         newnu= BKE_nurb_duplicate(nu);
1211                         BLI_addtail(&newnurb, newnu);
1212
1213                         if (nu->type == CU_NURBS) {
1214                                 BKE_nurb_order_clamp_u(nu);
1215                         }
1216                 }
1217
1218                 cu->nurb= newnurb;
1219
1220                 calc_shapeKeys(obedit);
1221                 ED_curve_updateAnimPaths(obedit->data);
1222
1223                 BKE_nurbList_free(&oldnurb);
1224         }
1225
1226         set_actNurb(obedit, NULL);
1227 }
1228
1229 /* make copy in cu->editnurb */
1230 void make_editNurb(Object *obedit)
1231 {
1232         Curve *cu= (Curve*)obedit->data;
1233         EditNurb *editnurb= cu->editnurb;
1234         Nurb *nu, *newnu, *nu_act= NULL;
1235         KeyBlock *actkey;
1236
1237
1238         set_actNurb(obedit, NULL);
1239
1240         if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
1241                 actkey= ob_get_keyblock(obedit);
1242
1243                 if (actkey) {
1244                         // XXX strcpy(G.editModeTitleExtra, "(Key) ");
1245                         undo_editmode_clear();
1246                         key_to_curve(actkey, cu, &cu->nurb);
1247                 }
1248
1249                 if (editnurb) {
1250                         BKE_nurbList_free(&editnurb->nurbs);
1251                         BKE_curve_editNurb_keyIndex_free(editnurb);
1252                         editnurb->keyindex= NULL;
1253                 }
1254                 else {
1255                         editnurb= MEM_callocN(sizeof(EditNurb), "editnurb");
1256                         cu->editnurb= editnurb;
1257                 }
1258
1259                 nu= cu->nurb.first;
1260                 cu->lastsel= NULL;   /* for select row */
1261
1262                 while (nu) {
1263                         newnu= BKE_nurb_duplicate(nu);
1264                         BKE_nurb_test2D(newnu); // after join, or any other creation of curve
1265                         BLI_addtail(&editnurb->nurbs, newnu);
1266
1267                         if (nu_act == NULL && isNurbsel(nu)) {
1268                                 nu_act= newnu;
1269                                 set_actNurb(obedit, newnu);
1270                         }
1271
1272                         nu= nu->next;
1273                 }
1274
1275                 if (actkey)
1276                         editnurb->shapenr= obedit->shapenr;
1277
1278                 /* animation could be added in editmode even if there was no animdata i
1279                  * object mode hence we always need CVs index be created */
1280                 init_editNurb_keyIndex(editnurb, &cu->nurb);
1281         }
1282 }
1283
1284 void free_editNurb(Object *obedit)
1285 {
1286         Curve *cu= obedit->data;
1287
1288         BKE_curve_editNurb_free(cu);
1289 }
1290
1291 void CU_deselect_all(Object *obedit)
1292 {
1293         ListBase *editnurb= object_editcurve_get(obedit);
1294
1295         if (editnurb) {
1296                 selectend_nurb(obedit, FIRST, 0, DESELECT); /* set first control points as unselected */
1297                 select_adjacent_cp(editnurb, 1, 1, DESELECT); /* cascade selection */
1298         }
1299 }
1300
1301 void CU_select_all(Object *obedit)
1302 {
1303         ListBase *editnurb= object_editcurve_get(obedit);
1304
1305         if (editnurb) {
1306                 selectend_nurb(obedit, FIRST, 0, SELECT); /* set first control points as unselected */
1307                 select_adjacent_cp(editnurb, 1, 1, SELECT); /* cascade selection */
1308         }
1309 }
1310
1311 void CU_select_swap(Object *obedit)
1312 {
1313         ListBase *editnurb= object_editcurve_get(obedit);
1314
1315         if (editnurb) {
1316                 Curve *cu= obedit->data;
1317                 Nurb *nu;
1318                 BPoint *bp;
1319                 BezTriple *bezt;
1320                 int a;
1321
1322                 cu->lastsel= NULL;
1323
1324                 for (nu= editnurb->first; nu; nu= nu->next) {
1325                         if (nu->type == CU_BEZIER) {
1326                                 bezt= nu->bezt;
1327                                 a= nu->pntsu;
1328                                 while (a--) {
1329                                         if (bezt->hide==0) {
1330                                                 bezt->f2 ^= SELECT; /* always do the center point */
1331                                                 if ((cu->drawflag & CU_HIDE_HANDLES)==0) {
1332                                                         bezt->f1 ^= SELECT;
1333                                                         bezt->f3 ^= SELECT;
1334                                                 }
1335                                         }
1336                                         bezt++;
1337                                 }
1338                         }
1339                         else {
1340                                 bp= nu->bp;
1341                                 a= nu->pntsu*nu->pntsv;
1342                                 while (a--) {
1343                                         swap_selection_bpoint(bp);
1344                                         bp++;
1345                                 }
1346                         }
1347                 }
1348         }
1349 }
1350
1351 /******************** separate operator ***********************/
1352
1353 static int separate_exec(bContext *C, wmOperator *op)
1354 {
1355         Main *bmain= CTX_data_main(C);
1356         Scene *scene= CTX_data_scene(C);
1357         Nurb *nu, *nu1;
1358         Object *oldob, *newob;
1359         Base *oldbase, *newbase;
1360         Curve *oldcu, *newcu;
1361         EditNurb *oldedit, *newedit;
1362
1363         oldbase= CTX_data_active_base(C);
1364         oldob= oldbase->object;
1365         oldcu= oldob->data;
1366         oldedit= oldcu->editnurb;
1367
1368         if (oldcu->key) {
1369                 BKE_report(op->reports, RPT_ERROR, "Can't separate a curve with vertex keys");
1370                 return OPERATOR_CANCELLED;
1371         }
1372
1373         WM_cursor_wait(1);
1374         
1375         /* 1. duplicate the object and data */
1376         newbase= ED_object_add_duplicate(bmain, scene, oldbase, 0);     /* 0 = fully linked */
1377         ED_base_object_select(newbase, BA_DESELECT);
1378         newob= newbase->object;
1379
1380         newcu= newob->data= BKE_curve_copy(oldcu);
1381         newcu->editnurb= NULL;
1382         oldcu->id.us--; /* because new curve is a copy: reduce user count */
1383
1384         /* 2. put new object in editmode and clear it */
1385         make_editNurb(newob);
1386         newedit= newcu->editnurb;
1387         BKE_nurbList_free(&newedit->nurbs);
1388         BKE_curve_editNurb_keyIndex_free(newedit);
1389
1390         /* 3. move over parts from old object */
1391         for (nu= oldedit->nurbs.first; nu; nu=nu1) {
1392                 nu1= nu->next;
1393
1394                 if (isNurbsel(nu)) {
1395                         BLI_remlink(&oldedit->nurbs, nu);
1396                         BLI_addtail(&newedit->nurbs, nu);
1397                 }
1398         }
1399
1400         /* 4. put old object out of editmode */
1401         load_editNurb(newob);
1402         free_editNurb(newob);
1403
1404         DAG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
1405         DAG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
1406
1407         WM_event_add_notifier(C, NC_GEOM|ND_DATA, oldob->data);
1408
1409         WM_cursor_wait(0);
1410
1411         return OPERATOR_FINISHED;
1412 }
1413
1414 void CURVE_OT_separate(wmOperatorType *ot)
1415 {
1416         /* identifiers */
1417         ot->name = "Separate";
1418         ot->idname = "CURVE_OT_separate";
1419         
1420         /* api callbacks */
1421         ot->exec = separate_exec;
1422         ot->poll = ED_operator_editsurfcurve;
1423         
1424         /* flags */
1425         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
1426 }
1427
1428 /* ******************* FLAGS ********************* */
1429
1430 static short isNurbselUV(Nurb *nu, int *u, int *v, int flag)
1431 {
1432         /* return u!=-1:     1 row in u-direction selected. U has value between 0-pntsv 
1433          * return v!=-1: 1 column in v-direction selected. V has value between 0-pntsu
1434          */
1435         BPoint *bp;
1436         int a, b, sel;
1437
1438         *u= *v= -1;
1439
1440         bp= nu->bp;
1441         for (b=0; b<nu->pntsv; b++) {
1442                 sel= 0;
1443                 for (a=0; a<nu->pntsu; a++, bp++) {
1444                         if (bp->f1 & flag) sel++;
1445                 }
1446                 if (sel==nu->pntsu) {
1447                         if (*u== -1) *u= b;
1448                         else return 0;
1449                 }
1450                 else if (sel>1) return 0;    /* because sel==1 is still ok */
1451         }
1452
1453         for (a=0; a<nu->pntsu; a++) {
1454                 sel= 0;
1455                 bp= nu->bp+a;
1456                 for (b=0; b<nu->pntsv; b++, bp+=nu->pntsu) {
1457                         if (bp->f1 & flag) sel++;
1458                 }
1459                 if (sel==nu->pntsv) {
1460                         if (*v== -1) *v= a;
1461                         else return 0;
1462                 }
1463                 else if (sel>1) return 0;
1464         }
1465
1466         if (*u==-1 && *v>-1) return 1;
1467         if (*v==-1 && *u>-1) return 1;
1468         return 0;
1469 }
1470
1471 static void setflagsNurb(ListBase *editnurb, short flag)
1472 {
1473         Nurb *nu;
1474         BezTriple *bezt;
1475         BPoint *bp;
1476         int a;
1477
1478         for (nu= editnurb->first; nu; nu= nu->next) {
1479                 if (nu->type == CU_BEZIER) {
1480                         a= nu->pntsu;
1481                         bezt= nu->bezt;
1482                         while (a--) {
1483                                 bezt->f1= bezt->f2= bezt->f3= flag;
1484                                 bezt++;
1485                         }
1486                 }
1487                 else {
1488                         a= nu->pntsu*nu->pntsv;
1489                         bp= nu->bp;
1490                         while (a--) {
1491                                 bp->f1= flag;
1492                                 bp++;
1493                         }
1494                 }
1495         }
1496 }
1497
1498 static void rotateflagNurb(ListBase *editnurb, short flag, float *cent, float rotmat[][3])
1499 {
1500         /* all verts with (flag & 'flag') rotate */
1501         Nurb *nu;
1502         BPoint *bp;
1503         int a;
1504
1505         for (nu= editnurb->first; nu; nu= nu->next) {
1506                 if (nu->type == CU_NURBS) {
1507                         bp= nu->bp;
1508                         a= nu->pntsu*nu->pntsv;
1509
1510                         while (a--) {
1511                                 if (bp->f1 & flag) {
1512                                         sub_v3_v3(bp->vec, cent);
1513                                         mul_m3_v3(rotmat, bp->vec);
1514                                         add_v3_v3(bp->vec, cent);
1515                                 }
1516                                 bp++;
1517                         }
1518                 }
1519         }
1520 }
1521
1522 static void translateflagNurb(ListBase *editnurb, short flag, const float vec[3])
1523 {
1524         /* all verts with ('flag' & flag) translate */
1525         Nurb *nu;
1526         BezTriple *bezt;
1527         BPoint *bp;
1528         int a;
1529
1530         for (nu= editnurb->first; nu; nu= nu->next) {
1531                 if (nu->type == CU_BEZIER) {
1532                         a= nu->pntsu;
1533                         bezt= nu->bezt;
1534                         while (a--) {
1535                                 if (bezt->f1 & flag) add_v3_v3(bezt->vec[0], vec);
1536                                 if (bezt->f2 & flag) add_v3_v3(bezt->vec[1], vec);
1537                                 if (bezt->f3 & flag) add_v3_v3(bezt->vec[2], vec);
1538                                 bezt++;
1539                         }
1540                 }
1541                 else {
1542                         a= nu->pntsu*nu->pntsv;
1543                         bp= nu->bp;
1544                         while (a--) {
1545                                 if (bp->f1 & flag) add_v3_v3(bp->vec, vec);
1546                                 bp++;
1547                         }
1548                 }
1549
1550                 BKE_nurb_test2D(nu);
1551         }
1552 }
1553
1554 static void weightflagNurb(ListBase *editnurb, short flag, float w)
1555 {
1556         Nurb *nu;
1557         BPoint *bp;
1558         int a;
1559
1560         for (nu= editnurb->first; nu; nu= nu->next) {
1561                 if (nu->type == CU_NURBS) {
1562                         a= nu->pntsu*nu->pntsv;
1563                         bp= nu->bp;
1564                         while (a--) {
1565                                 if (bp->f1 & flag) {
1566                                         /* a mode used to exist for replace/multiple but is was unused */
1567                                         bp->vec[3]*= w;
1568                                 }
1569                                 bp++;
1570                         }
1571                 }
1572         }
1573 }
1574
1575 static int deleteflagNurb(bContext *C, wmOperator *UNUSED(op), int flag)
1576 {
1577         Object *obedit= CTX_data_edit_object(C);
1578         Curve *cu= obedit->data;
1579         ListBase *editnurb= object_editcurve_get(obedit);
1580         Nurb *nu, *next;
1581         BPoint *bp, *bpn, *newbp;
1582         int a, b, newu, newv, sel;
1583
1584         if (obedit->type==OB_SURF);
1585         else return OPERATOR_CANCELLED;
1586
1587         cu->lastsel= NULL;
1588
1589         nu= editnurb->first;
1590         while (nu) {
1591                 next= nu->next;
1592
1593                 /* is entire nurb selected */
1594                 bp= nu->bp;
1595                 a= nu->pntsu*nu->pntsv;
1596                 while (a) {
1597                         a--;
1598                         if (bp->f1 & flag);
1599                         else break;
1600                         bp++;
1601                 }
1602                 if (a==0) {
1603                         BLI_remlink(editnurb, nu);
1604                         keyIndex_delNurb(cu->editnurb, nu);
1605                         BKE_nurb_free(nu); nu=NULL;
1606                 }
1607                 else {
1608                         /* is nurb in U direction selected */
1609                         newv= nu->pntsv;
1610                         bp= nu->bp;
1611                         for (b=0; b<nu->pntsv; b++) {
1612                                 sel= 0;
1613                                 for (a=0; a<nu->pntsu; a++, bp++) {
1614                                         if (bp->f1 & flag) sel++;
1615                                 }
1616                                 if (sel==nu->pntsu) {
1617                                         newv--;
1618                                 }
1619                                 else if (sel>=1) {
1620                                         /* don't delete */
1621                                         break;
1622                                 }
1623                         }
1624                         if (newv!=nu->pntsv && b==nu->pntsv)    {
1625                                 /* delete */
1626                                 bp= nu->bp;
1627                                 bpn = newbp =
1628                                         (BPoint*) MEM_mallocN(newv * nu->pntsu * sizeof(BPoint), "deleteNurb");
1629                                 for (b=0; b<nu->pntsv; b++) {
1630                                         if ((bp->f1 & flag)==0) {
1631                                                 memcpy(bpn, bp, nu->pntsu*sizeof(BPoint));
1632                                                 keyIndex_updateBP(cu->editnurb, bp, bpn, nu->pntsu);
1633                                                 bpn+= nu->pntsu;
1634                                         }
1635                                         else {
1636                                                 keyIndex_delBP(cu->editnurb, bp);
1637                                         }
1638                                         bp+= nu->pntsu;
1639                                 }
1640                                 nu->pntsv= newv;
1641                                 MEM_freeN(nu->bp);
1642                                 nu->bp= newbp;
1643                                 BKE_nurb_order_clamp_v(nu);
1644
1645                                 BKE_nurb_knot_calc_v(nu);
1646                         }
1647                         else {
1648                                 /* is the nurb in V direction selected */
1649                                 newu= nu->pntsu;
1650                                 for (a=0; a<nu->pntsu; a++) {
1651                                         bp= nu->bp+a;
1652                                         sel= 0;
1653                                         for (b=0; b<nu->pntsv; b++, bp+=nu->pntsu) {
1654                                                 if (bp->f1 & flag) sel++;
1655                                         }
1656                                         if (sel==nu->pntsv) {
1657                                                 newu--;
1658                                         }
1659                                         else if (sel>=1) {
1660                                                 /* don't delete */
1661                                                 break;
1662                                         }
1663                                 }
1664                                 if (newu!=nu->pntsu && a==nu->pntsu)    {
1665                                         /* delete */
1666                                         bp= nu->bp;
1667                                         bpn = newbp =
1668                                                 (BPoint*) MEM_mallocN(newu * nu->pntsv * sizeof(BPoint), "deleteNurb");
1669                                         for (b=0; b<nu->pntsv; b++) {
1670                                                 for (a=0; a<nu->pntsu; a++, bp++) {
1671                                                         if ((bp->f1 & flag)==0) {
1672                                                                 *bpn= *bp;
1673                                                                 keyIndex_updateBP(cu->editnurb, bp, bpn, 1);
1674                                                                 bpn++;
1675                                                         }
1676                                                         else {
1677                                                                 keyIndex_delBP(cu->editnurb, bp);
1678                                                         }
1679                                                 }
1680                                         }
1681                                         MEM_freeN(nu->bp);
1682                                         nu->bp= newbp;
1683                                         if (newu==1 && nu->pntsv>1) {    /* make a U spline */
1684                                                 nu->pntsu= nu->pntsv;
1685                                                 nu->pntsv= 1;
1686                                                 SWAP(short, nu->orderu, nu->orderv);
1687                                                 BKE_nurb_order_clamp_u(nu);
1688                                                 if (nu->knotsv) MEM_freeN(nu->knotsv);
1689                                                 nu->knotsv= NULL;
1690                                         }
1691                                         else {
1692                                                 nu->pntsu= newu;
1693                                                 BKE_nurb_order_clamp_u(nu);
1694                                         }
1695                                         BKE_nurb_knot_calc_u(nu);
1696                                 }
1697                         }
1698                 }
1699                 nu= next;
1700         }
1701
1702         if (ED_curve_updateAnimPaths(obedit->data))
1703                 WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
1704
1705         return OPERATOR_FINISHED;
1706 }
1707
1708 /* only for OB_SURF */
1709 static short extrudeflagNurb(EditNurb *editnurb, int flag)
1710 {
1711         Nurb *nu;
1712         BPoint *bp, *bpn, *newbp;
1713         int ok= 0, a, u, v, len;
1714
1715         nu= editnurb->nurbs.first;
1716         while (nu) {
1717
1718                 if (nu->pntsv==1) {
1719                         bp= nu->bp;
1720                         a= nu->pntsu;
1721                         while (a) {
1722                                 if (bp->f1 & flag);
1723                                 else break;
1724                                 bp++;
1725                                 a--;
1726                         }
1727                         if (a==0) {
1728                                 ok= 1;
1729                                 newbp =
1730                                         (BPoint*)MEM_mallocN(2 * nu->pntsu * sizeof(BPoint), "extrudeNurb1");
1731                                 ED_curve_bpcpy(editnurb, newbp, nu->bp, nu->pntsu);
1732                                 bp= newbp+ nu->pntsu;
1733                                 ED_curve_bpcpy(editnurb, bp, nu->bp, nu->pntsu);
1734                                 MEM_freeN(nu->bp);
1735                                 nu->bp= newbp;
1736                                 a= nu->pntsu;
1737                                 while (a--) {
1738                                         select_bpoint(bp, SELECT, flag, HIDDEN);
1739                                         select_bpoint(newbp, DESELECT, flag, HIDDEN);
1740                                         bp++; 
1741                                         newbp++;
1742                                 }
1743
1744                                 nu->pntsv= 2;
1745                                 nu->orderv= 2;
1746                                 BKE_nurb_knot_calc_v(nu);
1747                         }
1748                 }
1749                 else {
1750                         /* which row or column is selected */
1751
1752                         if ( isNurbselUV(nu, &u, &v, flag) ) {
1753
1754                                 /* deselect all */
1755                                 bp= nu->bp;
1756                                 a= nu->pntsu*nu->pntsv;
1757                                 while (a--) {
1758                                         select_bpoint(bp, DESELECT, flag, HIDDEN);
1759                                         bp++;
1760                                 }
1761
1762                                 if (u==0 || u== nu->pntsv-1) {      /* row in u-direction selected */
1763                                         ok= 1;
1764                                         newbp =
1765                                                 (BPoint*) MEM_mallocN(nu->pntsu*(nu->pntsv + 1)
1766                                                                                   * sizeof(BPoint), "extrudeNurb1");
1767                                         if (u==0) {
1768                                                 len= nu->pntsv*nu->pntsu;
1769                                                 ED_curve_bpcpy(editnurb, newbp+nu->pntsu, nu->bp, len);
1770                                                 ED_curve_bpcpy(editnurb, newbp, nu->bp, nu->pntsu);
1771                                                 bp= newbp;
1772                                         }
1773                                         else {
1774                                                 len= nu->pntsv*nu->pntsu;
1775                                                 ED_curve_bpcpy(editnurb, newbp, nu->bp, len);
1776                                                 ED_curve_bpcpy(editnurb, newbp+len, nu->bp+len-nu->pntsu, nu->pntsu);
1777                                                 bp= newbp+len;
1778                                         }
1779
1780                                         a= nu->pntsu;
1781                                         while (a--) {
1782                                                 select_bpoint(bp, SELECT, flag, HIDDEN);
1783                                                 bp++;
1784                                         }
1785
1786                                         MEM_freeN(nu->bp);
1787                                         nu->bp= newbp;
1788                                         nu->pntsv++;
1789                                         BKE_nurb_knot_calc_v(nu);
1790                                 }
1791                                 else if (v==0 || v== nu->pntsu-1) {         /* column in v-direction selected */
1792                                         ok= 1;
1793                                         bpn = newbp =
1794                                                 (BPoint*) MEM_mallocN((nu->pntsu + 1) * nu->pntsv * sizeof(BPoint), "extrudeNurb1");
1795                                         bp= nu->bp;
1796
1797                                         for (a=0; a<nu->pntsv; a++) {
1798                                                 if (v==0) {
1799                                                         *bpn= *bp;
1800                                                         bpn->f1 |= flag;
1801                                                         bpn++;
1802                                                 }
1803                                                 ED_curve_bpcpy(editnurb, bpn, bp, nu->pntsu);
1804                                                 bp+= nu->pntsu;
1805                                                 bpn+= nu->pntsu;
1806                                                 if (v== nu->pntsu-1) {
1807                                                         *bpn= *(bp-1);
1808                                                         bpn->f1 |= flag;
1809                                                         bpn++;
1810                                                 }
1811                                         }
1812
1813                                         MEM_freeN(nu->bp);
1814                                         nu->bp= newbp;
1815                                         nu->pntsu++;
1816                                         BKE_nurb_knot_calc_u(nu);
1817                                 }
1818                         }
1819                 }
1820                 nu= nu->next;
1821         }
1822
1823         return ok;
1824 }
1825
1826 static void adduplicateflagNurb(Object *obedit, short flag)
1827 {
1828         ListBase *editnurb= object_editcurve_get(obedit);
1829         Nurb *nu, *newnu;
1830         BezTriple *bezt, *bezt1;
1831         BPoint *bp, *bp1;
1832         Curve *cu= (Curve*)obedit->data;
1833         int a, b, starta, enda, newu, newv;
1834         char *usel;
1835
1836         cu->lastsel= NULL;
1837
1838         nu= editnurb->last;
1839         while (nu) {
1840                 if (nu->type == CU_BEZIER) {
1841                         bezt= nu->bezt;
1842                         for (a=0; a<nu->pntsu; a++) {
1843                                 enda= -1;
1844                                 starta= a;
1845                                 while ( (bezt->f1 & flag) || (bezt->f2 & flag) || (bezt->f3 & flag) ) {
1846                                         select_beztriple(bezt, DESELECT, flag, HIDDEN);
1847                                         enda=a;
1848                                         if (a>=nu->pntsu-1) break;
1849                                         a++;
1850                                         bezt++;
1851                                 }
1852                                 if (enda>=starta) {
1853                                         newnu = (Nurb*)MEM_mallocN(sizeof(Nurb), "adduplicateN");  
1854                                         memcpy(newnu, nu, sizeof(Nurb));
1855                                         BLI_addtail(editnurb, newnu);
1856                                         set_actNurb(obedit, newnu);
1857                                         newnu->pntsu= enda-starta+1;
1858                                         newnu->bezt=
1859                                                 (BezTriple*)MEM_mallocN((enda - starta + 1) * sizeof(BezTriple), "adduplicateN");  
1860                                         memcpy(newnu->bezt, nu->bezt+starta, newnu->pntsu*sizeof(BezTriple));
1861
1862                                         b= newnu->pntsu;
1863                                         bezt1= newnu->bezt;
1864                                         while (b--) {
1865                                                 select_beztriple(bezt1, SELECT, flag, HIDDEN);
1866                                                 bezt1++;
1867                                         }
1868
1869                                         if (nu->flagu & CU_NURB_CYCLIC) {
1870                                                 if (starta!=0 || enda!=nu->pntsu-1) {
1871                                                         newnu->flagu &= ~CU_NURB_CYCLIC;
1872                                                 }
1873                                         }
1874                                 }
1875                                 bezt++;
1876                         }
1877                 }
1878                 else if (nu->pntsv==1) {        /* because UV Nurb has a different method for dupli */
1879                         bp= nu->bp;
1880                         for (a=0; a<nu->pntsu; a++) {
1881                                 enda= -1;
1882                                 starta= a;
1883                                 while (bp->f1 & flag) {
1884                                         select_bpoint(bp, DESELECT, flag, HIDDEN);
1885                                         enda= a;
1886                                         if (a>=nu->pntsu-1) break;
1887                                         a++;
1888                                         bp++;
1889                                 }
1890                                 if (enda>=starta) {
1891                                         newnu = (Nurb*)MEM_mallocN(sizeof(Nurb), "adduplicateN3");  
1892                                         memcpy(newnu, nu, sizeof(Nurb));
1893                                         set_actNurb(obedit, newnu);
1894                                         BLI_addtail(editnurb, newnu);
1895                                         newnu->pntsu= enda-starta+1;
1896                                         newnu->bp = (BPoint*)MEM_mallocN((enda-starta+1) * sizeof(BPoint), "adduplicateN4");
1897                                         memcpy(newnu->bp, nu->bp+starta, newnu->pntsu*sizeof(BPoint));
1898
1899                                         b= newnu->pntsu;
1900                                         bp1= newnu->bp;
1901                                         while (b--) {
1902                                                 select_bpoint(bp1, SELECT, flag, HIDDEN);
1903                                                 bp1++;
1904                                         }
1905
1906                                         if (nu->flagu & CU_NURB_CYCLIC) {
1907                                                 if (starta!=0 || enda!=nu->pntsu-1) {
1908                                                         newnu->flagu &= ~CU_NURB_CYCLIC;
1909                                                 }
1910                                         }
1911
1912                                         /* knots */
1913                                         newnu->knotsu= NULL;
1914                                         BKE_nurb_knot_calc_u(newnu);
1915                                 }
1916                                 bp++;
1917                         }
1918                 }
1919                 else {
1920                         /* a rectangular area in nurb has to be selected */
1921                         if (isNurbsel(nu)) {
1922                                 usel= MEM_callocN(nu->pntsu, "adduplicateN4");
1923                                 bp= nu->bp;
1924                                 for (a=0; a<nu->pntsv; a++) {
1925                                         for (b=0; b<nu->pntsu; b++, bp++) {
1926                                                 if (bp->f1 & flag) usel[b]++;
1927                                         }
1928                                 }
1929                                 newu= 0;
1930                                 newv= 0;
1931                                 for (a=0; a<nu->pntsu; a++) {
1932                                         if (usel[a]) {
1933                                                 if (newv==0 || usel[a]==newv) {
1934                                                         newv= usel[a];
1935                                                         newu++;
1936                                                 }
1937                                                 else {
1938                                                         newv= 0;
1939                                                         break;
1940                                                 }
1941                                         }
1942                                 }
1943                                 if (newu==0 || newv==0) {
1944                                         if (G.debug & G_DEBUG)
1945                                                 printf("Can't duplicate Nurb\n");
1946                                 }
1947                                 else {
1948
1949                                         if (newu==1) SWAP(short, newu, newv);
1950
1951                                         newnu = (Nurb*)MEM_mallocN(sizeof(Nurb), "adduplicateN5");
1952                                         memcpy(newnu, nu, sizeof(Nurb));
1953                                         BLI_addtail(editnurb, newnu);
1954                                         set_actNurb(obedit, newnu);
1955                                         newnu->pntsu= newu;
1956                                         newnu->pntsv= newv;
1957                                         newnu->bp =
1958                                                 (BPoint*)MEM_mallocN(newu * newv * sizeof(BPoint), "adduplicateN6");
1959                                         BKE_nurb_order_clamp_u(newnu);
1960                                         BKE_nurb_order_clamp_v(newnu);
1961                                         
1962                                         newnu->knotsu= newnu->knotsv= NULL;
1963                                         
1964                                         bp= newnu->bp;
1965                                         bp1= nu->bp;
1966                                         for (a=0; a<nu->pntsv; a++) {
1967                                                 for (b=0; b<nu->pntsu; b++, bp1++) {
1968                                                         if (bp1->f1 & flag) {
1969                                                                 memcpy(bp, bp1, sizeof(BPoint));
1970                                                                 select_bpoint(bp1, DESELECT, flag, HIDDEN);
1971                                                                 bp++;
1972                                                         }
1973                                                 }
1974                                         }
1975                                         if (BKE_nurb_check_valid_u(newnu)) {
1976                                                 if (nu->pntsu==newnu->pntsu && nu->knotsu) {
1977                                                         newnu->knotsu= MEM_dupallocN(nu->knotsu);
1978                                                 }
1979                                                 else {
1980                                                         BKE_nurb_knot_calc_u(newnu);
1981                                                 }
1982                                         }
1983                                         if (BKE_nurb_check_valid_v(newnu)) {
1984                                                 if (nu->pntsv==newnu->pntsv && nu->knotsv) {
1985                                                         newnu->knotsv= MEM_dupallocN(nu->knotsv);
1986                                                 }
1987                                                 else {
1988                                                         BKE_nurb_knot_calc_v(newnu);
1989                                                 }
1990                                         }
1991                                 }
1992                                 MEM_freeN(usel);
1993                         }
1994                 }
1995
1996                 nu= nu->prev;
1997         }
1998         
1999         /* actnu changed */
2000 }
2001
2002 /**************** switch direction operator ***************/
2003
2004 static int switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
2005 {
2006         Object *obedit= CTX_data_edit_object(C);
2007         Curve *cu= (Curve*)obedit->data;
2008         EditNurb *editnurb= cu->editnurb;
2009         Nurb *nu;
2010
2011         for (nu= editnurb->nurbs.first; nu; nu= nu->next)
2012                 if (isNurbsel(nu)) {
2013                         BKE_nurb_direction_switch(nu);
2014                         keyData_switchDirectionNurb(cu, nu);
2015                 }
2016
2017         if (ED_curve_updateAnimPaths(obedit->data))
2018                 WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
2019
2020         DAG_id_tag_update(obedit->data, 0);
2021         WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
2022
2023         return OPERATOR_FINISHED;
2024 }
2025
2026 void CURVE_OT_switch_direction(wmOperatorType *ot)
2027 {
2028         /* identifiers */
2029         ot->name = "Switch Direction";
2030         ot->description = "Switch direction of selected splines";
2031         ot->idname = "CURVE_OT_switch_direction";
2032         
2033         /* api callbacks */
2034         ot->exec = switch_direction_exec;
2035         ot->poll = ED_operator_editsurfcurve;
2036
2037         /* flags */
2038         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2039 }
2040
2041 /****************** set weight operator *******************/
2042
2043 static int set_goal_weight_exec(bContext *C, wmOperator *op)
2044 {
2045         Object *obedit= CTX_data_edit_object(C);
2046         ListBase *editnurb= object_editcurve_get(obedit);
2047         Nurb *nu;
2048         BezTriple *bezt;
2049         BPoint *bp;
2050         float weight= RNA_float_get(op->ptr, "weight");
2051         int a;
2052                                 
2053         for (nu= editnurb->first; nu; nu= nu->next) {
2054                 if (nu->bezt) {
2055                         for (bezt=nu->bezt, a=0; a<nu->pntsu; a++, bezt++) {
2056                                 if (bezt->f2 & SELECT)
2057                                         bezt->weight= weight;
2058                         }
2059                 }
2060                 else if (nu->bp) {
2061                         for (bp=nu->bp, a=0; a<nu->pntsu*nu->pntsv; a++, bp++) {
2062                                 if (bp->f1 & SELECT)
2063                                         bp->weight= weight;
2064                         }
2065                 }
2066         }       
2067
2068         DAG_id_tag_update(obedit->data, 0);
2069         WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
2070
2071         return OPERATOR_FINISHED;
2072 }
2073
2074 void CURVE_OT_spline_weight_set(wmOperatorType *ot)
2075 {
2076         /* identifiers */
2077         ot->name = "Set Goal Weight";
2078         ot->description = "Set softbody goal weight for selected points";
2079         ot->idname = "CURVE_OT_spline_weight_set";
2080         
2081         /* api callbacks */
2082         ot->exec = set_goal_weight_exec;
2083         ot->invoke = WM_operator_props_popup;
2084         ot->poll = ED_operator_editsurfcurve;
2085
2086         /* flags */
2087         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2088
2089         /* properties */
2090         RNA_def_float_factor(ot->srna, "weight", 1.0f, 0.0f, 1.0f, "Weight", "", 0.0f, 1.0f);
2091 }
2092
2093 /******************* set radius operator ******************/
2094
2095 static int set_radius_exec(bContext *C, wmOperator *op)
2096 {
2097         Object *obedit= CTX_data_edit_object(C);
2098         ListBase *editnurb= object_editcurve_get(obedit);
2099         Nurb *nu;
2100         BezTriple *bezt;
2101         BPoint *bp;
2102         float radius= RNA_float_get(op->ptr, "radius");
2103         int a;
2104         
2105         for (nu= editnurb->first; nu; nu= nu->next) {
2106                 if (nu->bezt) {
2107                         for (bezt=nu->bezt, a=0; a<nu->pntsu; a++, bezt++) {
2108                                 if (bezt->f2 & SELECT)
2109                                         bezt->radius= radius;
2110                         }
2111                 }
2112                 else if (nu->bp) {
2113                         for (bp=nu->bp, a=0; a<nu->pntsu*nu->pntsv; a++, bp++) {
2114                                 if (bp->f1 & SELECT)
2115                                         bp->radius= radius;
2116                         }
2117                 }
2118         }       
2119
2120         WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
2121         DAG_id_tag_update(obedit->data, 0);
2122
2123         return OPERATOR_FINISHED;
2124 }
2125
2126 void CURVE_OT_radius_set(wmOperatorType *ot)
2127 {
2128         /* identifiers */
2129         ot->name = "Set Curve Radius";
2130         ot->description = "Set per-point radius which is used for bevel tapering";
2131         ot->idname = "CURVE_OT_radius_set";
2132         
2133         /* api callbacks */
2134         ot->exec = set_radius_exec;
2135         ot->invoke = WM_operator_props_popup;
2136         ot->poll = ED_operator_editsurfcurve;
2137
2138         /* flags */
2139         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2140
2141         /* properties */
2142         RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, "Radius", "", 0.0001f, 10.0f);
2143 }
2144
2145 /********************* smooth operator ********************/
2146
2147 static int smooth_exec(bContext *C, wmOperator *UNUSED(op))
2148 {
2149         Object *obedit= CTX_data_edit_object(C);
2150         ListBase *editnurb= object_editcurve_get(obedit);
2151         Nurb *nu;
2152         BezTriple *bezt, *beztOrig;
2153         BPoint *bp, *bpOrig;
2154         float val, newval, offset;
2155         int a, i, change = 0;
2156         
2157         for (nu= editnurb->first; nu; nu= nu->next) {
2158                 if (nu->bezt) {
2159                         change = 0;
2160                         beztOrig = MEM_dupallocN(nu->bezt);
2161                         for (bezt=nu->bezt+1, a=1; a<nu->pntsu-1; a++, bezt++) {
2162                                 if (bezt->f2 & SELECT) {
2163                                         for (i=0; i<3; i++) {
2164                                                 val = bezt->vec[1][i];
2165                                                 newval = ((beztOrig+(a-1))->vec[1][i] * 0.5f) + ((beztOrig+(a+1))->vec[1][i] * 0.5f);
2166                                                 offset = (val*((1.0f/6.0f)*5.0f)) + (newval*(1.0f/6.0f)) - val;
2167                                                 /* offset handles */
2168                                                 bezt->vec[1][i] += offset;
2169                                                 bezt->vec[0][i] += offset;
2170                                                 bezt->vec[2][i] += offset;
2171                                         }
2172                                         change = 1;
2173                                 }
2174                         }
2175                         MEM_freeN(beztOrig);
2176                         if (change)
2177                                 BKE_nurb_handles_calc(nu);
2178                 }
2179                 else if (nu->bp) {
2180                         bpOrig = MEM_dupallocN(nu->bp);
2181                         /* Same as above, keep these the same! */
2182                         for (bp=nu->bp+1, a=1; a<nu->pntsu-1; a++, bp++) {
2183                                 if (bp->f1 & SELECT) {
2184                                         for (i=0; i<3; i++) {
2185                                                 val = bp->vec[i];
2186                                                 newval = ((bpOrig+(a-1))->vec[i] * 0.5f) + ((bpOrig+(a+1))->vec[i] * 0.5f);
2187                                                 offset = (val*((1.0f/6.0f)*5.0f)) + (newval*(1.0f/6.0f)) - val;
2188                                         
2189                                                 bp->vec[i] += offset;
2190                                         }
2191                                 }
2192                         }
2193                         MEM_freeN(bpOrig);
2194                 }
2195         }
2196
2197         WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
2198         DAG_id_tag_update(obedit->data, 0);
2199
2200         return OPERATOR_FINISHED;
2201 }
2202
2203 void CURVE_OT_smooth(wmOperatorType *ot)
2204 {
2205         /* identifiers */
2206         ot->name = "Smooth";
2207         ot->description = "Flatten angles of selected points";
2208         ot->idname = "CURVE_OT_smooth";
2209         
2210         /* api callbacks */
2211         ot->exec = smooth_exec;
2212         ot->poll = ED_operator_editsurfcurve;
2213
2214         /* flags */
2215         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2216 }
2217
2218 /**************** smooth curve radius operator *************/
2219
2220 /* TODO, make smoothing distance based */
2221 static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op))
2222 {
2223         Object *obedit= CTX_data_edit_object(C);
2224         ListBase *editnurb= object_editcurve_get(obedit);
2225         Nurb *nu;
2226         BezTriple *bezt;
2227         BPoint *bp;
2228         int a;
2229         
2230         /* use for smoothing */
2231         int last_sel;
2232         int start_sel, end_sel; /* selection indices, inclusive */
2233         float start_rad, end_rad, fac, range;
2234         
2235         for (nu= editnurb->first; nu; nu= nu->next) {
2236                 if (nu->bezt) {
2237                         
2238                         for (last_sel=0; last_sel < nu->pntsu; last_sel++) {
2239                                 /* loop over selection segments of a curve, smooth each */
2240                                 
2241                                 /* Start BezTriple code, this is duplicated below for points, make sure these functions stay in sync */
2242                                 start_sel = -1;
2243                                 for (bezt=nu->bezt+last_sel, a=last_sel; a<nu->pntsu; a++, bezt++) {
2244                                         if (bezt->f2 & SELECT) {
2245                                                 start_sel = a;
2246                                                 break;
2247                                         }
2248                                 }
2249                                 /* in case there are no other selected verts */
2250                                 end_sel = start_sel;
2251                                 for (bezt=nu->bezt+(start_sel+1), a=start_sel+1; a<nu->pntsu; a++, bezt++) {
2252                                         if ((bezt->f2 & SELECT)==0) {
2253                                                 break;
2254                                         }
2255                                         end_sel = a;
2256                                 }
2257                                 
2258                                 if (start_sel == -1) {
2259                                         last_sel = nu->pntsu; /* next... */
2260                                 }
2261                                 else {
2262                                         last_sel = end_sel; /* before we modify it */
2263                                         
2264                                         /* now blend between start and end sel */
2265                                         start_rad = end_rad = -1.0;
2266                                         
2267                                         if (start_sel == end_sel) {
2268                                                 /* simple, only 1 point selected */
2269                                                 if (start_sel>0)                                                start_rad = (nu->bezt+start_sel-1)->radius;
2270                                                 if (end_sel!=-1 && end_sel < nu->pntsu) end_rad = (nu->bezt+start_sel+1)->radius;
2271                                                 
2272                                                 if (start_rad >= 0.0f && end_rad >= 0.0f)       (nu->bezt+start_sel)->radius = (start_rad + end_rad)/2;
2273                                                 else if (start_rad >= 0.0f)                             (nu->bezt+start_sel)->radius = start_rad;
2274                                                 else if (end_rad >= 0.0f)                               (nu->bezt+start_sel)->radius = end_rad;
2275                                         }
2276                                         else {
2277                                                 /* if endpoints selected, then use them */
2278                                                 if (start_sel==0) {
2279                                                         start_rad = (nu->bezt+start_sel)->radius;
2280                                                         start_sel++; /* we don't want to edit the selected endpoint */
2281                                                 }
2282                                                 else {
2283                                                         start_rad = (nu->bezt+start_sel-1)->radius;
2284                                                 }
2285                                                 if (end_sel==nu->pntsu-1) {
2286                                                         end_rad = (nu->bezt+end_sel)->radius;
2287                                                         end_sel--; /* we don't want to edit the selected endpoint */
2288                                                 }
2289                                                 else {
2290                                                         end_rad = (nu->bezt+end_sel+1)->radius;
2291                                                 }
2292                                                 
2293                                                 /* Now Blend between the points */
2294                                                 range = (float)(end_sel - start_sel) + 2.0f;
2295                                                 for (bezt=nu->bezt+start_sel, a=start_sel; a<=end_sel; a++, bezt++) {
2296                                                         fac = (float)(1+a-start_sel) / range;
2297                                                         bezt->radius = start_rad*(1.0f-fac) + end_rad*fac;
2298                                                 }
2299                                         }
2300                                 }
2301                         }
2302                 }
2303                 else if (nu->bp) {
2304                         /* Same as above, keep these the same! */
2305                         for (last_sel=0; last_sel < nu->pntsu; last_sel++) {
2306                                 /* loop over selection segments of a curve, smooth each */
2307                                 
2308                                 /* Start BezTriple code, this is duplicated below for points, make sure these functions stay in sync */
2309                                 start_sel = -1;
2310                                 for (bp=nu->bp+last_sel, a=last_sel; a<nu->pntsu; a++, bp++) {
2311                                         if (bp->f1 & SELECT) {
2312                                                 start_sel = a;
2313                                                 break;
2314                                         }
2315                                 }
2316                                 /* in case there are no other selected verts */
2317                                 end_sel = start_sel;
2318                                 for (bp=nu->bp+(start_sel+1), a=start_sel+1; a<nu->pntsu; a++, bp++) {
2319                                         if ((bp->f1 & SELECT)==0) {
2320                                                 break;
2321                                         }
2322                                         end_sel = a;
2323                                 }
2324                                 
2325                                 if (start_sel == -1) {
2326                                         last_sel = nu->pntsu; /* next... */
2327                                 }
2328                                 else {
2329                                         last_sel = end_sel; /* before we modify it */
2330                                         
2331                                         /* now blend between start and end sel */
2332                                         start_rad = end_rad = -1.0;
2333                                         
2334                                         if (start_sel == end_sel) {
2335                                                 /* simple, only 1 point selected */
2336                                                 if (start_sel>0)                                                start_rad = (nu->bp+start_sel-1)->radius;
2337                                                 if (end_sel!=-1 && end_sel < nu->pntsu) end_rad = (nu->bp+start_sel+1)->radius;
2338                                                 
2339                                                 if (start_rad >= 0.0f && end_rad >= 0.0f)       (nu->bp+start_sel)->radius = (start_rad + end_rad)/2;
2340                                                 else if (start_rad >= 0.0f)                                     (nu->bp+start_sel)->radius = start_rad;
2341                                                 else if (end_rad >= 0.0f)                                       (nu->bp+start_sel)->radius = end_rad;
2342                                         }
2343                                         else {
2344                                                 /* if endpoints selected, then use them */
2345                                                 if (start_sel==0) {
2346                                                         start_rad = (nu->bp+start_sel)->radius;
2347                                                         start_sel++; /* we don't want to edit the selected endpoint */
2348                                                 }
2349                                                 else {
2350                                                         start_rad = (nu->bp+start_sel-1)->radius;
2351                                                 }
2352                                                 if (end_sel==nu->pntsu-1) {
2353                                                         end_rad = (nu->bp+end_sel)->radius;
2354                                                         end_sel--; /* we don't want to edit the selected endpoint */
2355                                                 }
2356                                                 else {
2357                                                         end_rad = (nu->bp+end_sel+1)->radius;
2358                                                 }
2359                                                 
2360                                                 /* Now Blend between the points */
2361                                                 range = (float)(end_sel - start_sel) + 2.0f;
2362                                                 for (bp=nu->bp+start_sel, a=start_sel; a<=end_sel; a++, bp++) {
2363                                                         fac = (float)(1+a-start_sel) / range;
2364                                                         bp->radius = start_rad*(1.0f-fac) + end_rad*fac;
2365                                                 }
2366                                         }
2367                                 }
2368                         }
2369                 }
2370         }
2371
2372         WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
2373         DAG_id_tag_update(obedit->data, 0);
2374
2375         return OPERATOR_FINISHED;
2376 }
2377
2378 void CURVE_OT_smooth_radius(wmOperatorType *ot)
2379 {
2380         /* identifiers */
2381         ot->name = "Smooth Curve Radius";
2382         ot->description = "Flatten radiuses of selected points";
2383         ot->idname = "CURVE_OT_smooth_radius";
2384         
2385         /* api clastbacks */
2386         ot->exec = smooth_radius_exec;
2387         ot->poll = ED_operator_editsurfcurve;
2388         
2389         /* flags */
2390         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2391 }
2392
2393 /***************** selection utility *************************/
2394
2395 /* next == 1 -> select next             */
2396 /* next == -1 -> select previous        */
2397 /* cont == 1 -> select continuously     */
2398 /* selstatus, inverts behavior          */
2399 static void select_adjacent_cp(ListBase *editnurb, short next, short cont, short selstatus)
2400 {
2401         Nurb *nu;
2402         BezTriple *bezt;
2403         BPoint *bp;
2404         int a;
2405         short lastsel= 0;
2406         
2407         if (next==0) return;
2408         
2409         for (nu= editnurb->first; nu; nu= nu->next) {
2410                 lastsel=0;
2411                 if (nu->type == CU_BEZIER) {                    
2412                         a= nu->pntsu;
2413                         bezt= nu->bezt;
2414                         if (next < 0) bezt= (nu->bezt + (a-1));
2415                         while (a--) {
2416                                 if (a-abs(next) < 0) break;
2417                                 if ((lastsel==0) && (bezt->hide==0) && ((bezt->f2 & SELECT) || (selstatus==0))) {
2418                                         bezt+=next;
2419                                         if (!(bezt->f2 & SELECT) || (selstatus==0)) {
2420                                                 short sel= select_beztriple(bezt, selstatus, 1, VISIBLE);
2421                                                 if ((sel==1) && (cont==0)) lastsel= 1;
2422                                         }
2423                                 }
2424                                 else {
2425                                         bezt+=next;
2426                                         lastsel= 0;
2427                                 }
2428                                 /* move around in zigzag way so that we go through each */                              
2429                                 bezt-=(next-next/abs(next));                            
2430                         }
2431                 }
2432                 else {
2433                         a= nu->pntsu*nu->pntsv;
2434                         bp= nu->bp;
2435                         if (next < 0) bp= (nu->bp + (a-1));
2436                         while (a--) {
2437                                 if (a-abs(next) < 0) break;
2438                                 if ((lastsel==0) && (bp->hide==0) && ((bp->f1 & SELECT) || (selstatus==0))) {
2439                                         bp+=next;
2440                                         if (!(bp->f1 & SELECT) || (selstatus==0)) {
2441                                                 short sel= select_bpoint(bp, selstatus, 1, VISIBLE);
2442                                                 if ((sel==1) && (cont==0)) lastsel= 1;
2443                                         }                       
2444                                 }
2445                                 else {
2446                                         bp+=next;
2447                                         lastsel= 0;
2448                                 }
2449                                 /* move around in zigzag way so that we go through each */
2450                                 bp-=(next-next/abs(next));                              
2451                         }
2452                 }
2453         }
2454 }
2455
2456 /**************** select start/end operators **************/
2457
2458 /* (de)selects first or last of visible part of each Nurb depending on selFirst     */
2459 /* selFirst: defines the end of which to select                                     */
2460 /* doswap: defines if selection state of each first/last control point is swapped   */
2461 /* selstatus: selection status in case doswap is false                              */
2462 void selectend_nurb(Object *obedit, short selfirst, short doswap, short selstatus)
2463 {
2464         ListBase *editnurb= object_editcurve_get(obedit);
2465         Nurb *nu;
2466         BPoint *bp;
2467         BezTriple *bezt;
2468         Curve *cu;
2469         int a;
2470
2471         if (obedit==NULL) return;
2472
2473         cu= (Curve*)obedit->data;
2474         cu->lastsel= NULL;
2475
2476         for (nu= editnurb->first; nu; nu= nu->next) {
2477                 if (nu->type == CU_BEZIER) {
2478                         a= nu->pntsu;
2479                         
2480                         /* which point? */
2481                         if (selfirst==0) { /* select last */ 
2482                                 bezt= (nu->bezt + (a-1));
2483                         }
2484                         else { /* select first */
2485                                 bezt= nu->bezt;
2486                         }
2487                         
2488                         while (a--) {
2489                                 short sel;
2490                                 if (doswap) sel= swap_selection_beztriple(bezt);
2491                                 else sel= select_beztriple(bezt, selstatus, 1, VISIBLE);
2492                                 
2493                                 if (sel==1) break;
2494                         }
2495                 }
2496                 else {
2497                         a= nu->pntsu*nu->pntsv;
2498                         
2499                         /* which point? */
2500                         if (selfirst==0) { /* select last */
2501                                 bp= (nu->bp + (a-1));
2502                         }
2503                         else { /* select first */
2504                                 bp= nu->bp;
2505                         }
2506
2507                         while (a--) {
2508                                 if (bp->hide == 0) {
2509                                         short sel;
2510                                         if (doswap) sel= swap_selection_bpoint(bp);
2511                                         else sel= select_bpoint(bp, selstatus, 1, VISIBLE);
2512                                         
2513                                         if (sel==1) break;
2514                                 }
2515                         }
2516                 }
2517         }
2518 }
2519
2520 static int de_select_first_exec(bContext *C, wmOperator *UNUSED(op))
2521 {
2522         Object *obedit= CTX_data_edit_object(C);
2523
2524         selectend_nurb(obedit, FIRST, 1, DESELECT);
2525         WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
2526
2527         return OPERATOR_FINISHED;
2528 }
2529
2530 void CURVE_OT_de_select_first(wmOperatorType *ot)
2531 {
2532         /* identifiers */
2533         ot->name = "(De)select First";
2534         ot->idname = "CURVE_OT_de_select_first";
2535         
2536         /* api cfirstbacks */
2537         ot->exec = de_select_first_exec;
2538         ot->poll = ED_operator_editcurve;
2539         
2540         /* flags */
2541         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2542 }
2543
2544 static int de_select_last_exec(bContext *C, wmOperator *UNUSED(op))
2545 {
2546         Object *obedit= CTX_data_edit_object(C);
2547
2548         selectend_nurb(obedit, LAST, 1, DESELECT);
2549         WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
2550
2551         return OPERATOR_FINISHED;
2552 }
2553
2554 void CURVE_OT_de_select_last(wmOperatorType *ot)
2555 {
2556         /* identifiers */
2557         ot->name = "(De)select Last";
2558         ot->idname = "CURVE_OT_de_select_last";
2559         
2560         /* api clastbacks */
2561         ot->exec = de_select_last_exec;
2562         ot->poll = ED_operator_editcurve;
2563         
2564         /* flags */
2565         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2566 }
2567
2568 /******************* de select all operator ***************/
2569
2570 static short nurb_has_selected_cps(ListBase *editnurb)
2571 {
2572         Nurb *nu;
2573         BezTriple *bezt;
2574         BPoint *bp;
2575         int a;
2576
2577         for (nu= editnurb->first; nu; nu= nu->next) {
2578                 if (nu->type == CU_BEZIER) {
2579                         a= nu->pntsu;
2580                         bezt= nu->bezt;
2581                         while (a--) {
2582                                 if (bezt->hide==0) {
2583                                         if ((bezt->f1 & SELECT) ||
2584                                             (bezt->f2 & SELECT) ||
2585                                             (bezt->f3 & SELECT))
2586                                         {
2587                                                 return 1;
2588                                         }
2589                                 }
2590                                 bezt++;
2591                         }
2592                 }
2593                 else {
2594                         a= nu->pntsu*nu->pntsv;
2595                         bp= nu->bp;
2596                         while (a--) {
2597                                 if ((bp->hide==0) && (bp->f1 & SELECT)) return 1;
2598                                 bp++;
2599                         }
2600                 }
2601         }
2602         
2603         return 0;
2604 }
2605
2606 static int de_select_all_exec(bContext *C, wmOperator *op)
2607 {
2608         Object *obedit= CTX_data_edit_object(C);
2609         ListBase *editnurb= object_editcurve_get(obedit);
2610         int action = RNA_enum_get(op->ptr, "action");
2611
2612         if (action == SEL_TOGGLE) {
2613                 action = SEL_SELECT;
2614                 if (nurb_has_selected_cps(editnurb))
2615                         action = SEL_DESELECT;
2616         }
2617
2618         switch (action) {
2619                 case SEL_SELECT:
2620                         CU_select_all(obedit);
2621                         break;
2622                 case SEL_DESELECT:
2623                         CU_deselect_all(obedit);
2624                         break;
2625                 case SEL_INVERT:
2626                         CU_select_swap(obedit);
2627                         break;
2628         }
2629         
2630         WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
2631
2632         return OPERATOR_FINISHED;
2633 }
2634
2635 void CURVE_OT_select_all(wmOperatorType *ot)
2636 {
2637         /* identifiers */
2638         ot->name = "(De)select All";
2639         ot->idname = "CURVE_OT_select_all";
2640         
2641         /* api callbacks */
2642         ot->exec = de_select_all_exec;
2643         ot->poll = ED_operator_editsurfcurve;
2644         
2645         /* flags */
2646         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2647
2648         /* properties */
2649         WM_operator_properties_select_all(ot);
2650 }
2651
2652 /********************** hide operator *********************/
2653
2654 static int hide_exec(bContext *C, wmOperator *op)
2655 {
2656         Object *obedit= CTX_data_edit_object(C);
2657         Curve *cu= obedit->data;
2658         ListBase *editnurb= object_editcurve_get(obedit);
2659         Nurb *nu;
2660         BPoint *bp;
2661         BezTriple *bezt;
2662         int a, sel, invert= RNA_boolean_get(op->ptr, "unselected");
2663
2664         for (nu= editnurb->first; nu; nu= nu->next) {
2665                 if (nu->type == CU_BEZIER) {
2666                         bezt= nu->bezt;
2667                         a= nu->pntsu;
2668                         sel= 0;
2669                         while (a--) {
2670                                 if (invert == 0 && BEZSELECTED_HIDDENHANDLES(cu, bezt)) {
2671                                         select_beztriple(bezt, DESELECT, 1, HIDDEN);
2672                                         bezt->hide= 1;
2673                                 }
2674                                 else if (invert && !BEZSELECTED_HIDDENHANDLES(cu, bezt)) {
2675                                         select_beztriple(bezt, DESELECT, 1, HIDDEN);
2676                                         bezt->hide= 1;
2677                                 }
2678                                 if (bezt->hide) sel++;
2679                                 bezt++;
2680                         }
2681                         if (sel==nu->pntsu) nu->hide= 1;
2682                 }
2683                 else {
2684                         bp= nu->bp;
2685                         a= nu->pntsu*nu->pntsv;
2686                         sel= 0;
2687                         while (a--) {
2688                                 if (invert==0 && (bp->f1 & SELECT)) {
2689                                         select_bpoint(bp, DESELECT, 1, HIDDEN);
2690                                         bp->hide= 1;
2691                                 }
2692                                 else if (invert && (bp->f1 & SELECT)==0) {
2693                                         select_bpoint(bp, DESELECT, 1, HIDDEN);
2694                                         bp->hide= 1;
2695                                 }
2696                                 if (bp->hide) sel++;
2697                                 bp++;
2698                         }
2699                         if (sel==nu->pntsu*nu->pntsv) nu->hide= 1;
2700                 }
2701         }
2702
2703         DAG_id_tag_update(obedit->data, 0);
2704         WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
2705
2706         return OPERATOR_FINISHED;       
2707 }
2708
2709 void CURVE_OT_hide(wmOperatorType *ot)
2710 {
2711         /* identifiers */
2712         ot->name = "Hide Selected";
2713         ot->idname = "CURVE_OT_hide";
2714         
2715         /* api callbacks */
2716         ot->exec = hide_exec;
2717         ot->poll = ED_operator_editsurfcurve;
2718         
2719         /* flags */
2720         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2721         
2722         /* props */
2723         RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected");
2724 }
2725
2726 /********************** reveal operator *********************/
2727
2728 static int reveal_exec(bContext *C, wmOperator *UNUSED(op))
2729 {
2730         Object *obedit= CTX_data_edit_object(C);
2731         ListBase *editnurb= object_editcurve_get(obedit);
2732         Nurb *nu;
2733         BPoint *bp;
2734         BezTriple *bezt;
2735         int a;
2736
2737         for (nu= editnurb->first; nu; nu= nu->next) {
2738                 nu->hide= 0;
2739                 if (nu->type == CU_BEZIER) {
2740                         bezt= nu->bezt;
2741                         a= nu->pntsu;
2742                         while (a--) {
2743                                 if (bezt->hide) {
2744                                         select_beztriple(bezt, SELECT, 1, HIDDEN);
2745                                         bezt->hide= 0;
2746                                 }
2747                                 bezt++;
2748                         }
2749                 }
2750                 else {
2751                         bp= nu->bp;
2752                         a= nu->pntsu*nu->pntsv;
2753                         while (a--) {
2754                                 if (bp->hide) {
2755                                         select_bpoint(bp, SELECT, 1, HIDDEN);
2756                                         bp->hide= 0;
2757                                 }
2758                                 bp++;
2759                         }
2760                 }
2761         }
2762
2763         DAG_id_tag_update(obedit->data, 0);
2764         WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
2765
2766         return OPERATOR_FINISHED;       
2767 }
2768
2769 void CURVE_OT_reveal(wmOperatorType *ot)
2770 {
2771         /* identifiers */
2772         ot->name = "Reveal Hidden";
2773         ot->idname = "CURVE_OT_reveal";
2774         
2775         /* api callbacks */
2776         ot->exec = reveal_exec;
2777         ot->poll = ED_operator_editsurfcurve;
2778         
2779         /* flags */
2780         ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
2781 }
2782
2783 /********************** subdivide operator *********************/
2784
2785 /** Divide the line segments associated with the currently selected
2786  * curve nodes (Bezier or NURB). If there are no valid segment
2787  * selections within the current selection, nothing happens.
2788  */
2789 static void subdividenurb(Object *obedit, int number_cuts)
2790 {
2791         Curve *cu= obedit->data;
2792         EditNurb *editnurb= cu->editnurb;
2793         Nurb *nu;
2794         BezTriple *prevbezt, *bezt, *beztnew, *beztn;
2795         BPoint *bp, *prevbp, *bpnew, *bpn;
2796         float vec[15];
2797         int a, b, sel, amount, *usel, *vsel, i;
2798         float factor;
2799
2800         // printf("*** subdivideNurb: entering subdivide\n");
2801
2802         for (nu= editnurb->nurbs.first; nu; nu= nu->next) {
2803                 amount= 0;
2804                 if (nu->type == CU_BEZIER) {
2805                 /* 
2806                  * Insert a point into a 2D Bezier curve. 
2807                  * Endpoints are preserved. Otherwise, all selected and inserted points are 
2808                  * newly created. Old points are discarded.
2809                  */
2810                         /* count */