rna data path names which are more likely to break animations.
[blender-staging.git] / source / blender / editors / mesh / editmesh_add.c
1 /**
2  * $Id$
3  *
4  * ***** BEGIN GPL LICENSE BLOCK *****
5  *
6  * This program is free software; you can redistribute it and/or
7  * modify it under the terms of the GNU General Public License
8  * as published by the Free Software Foundation; either version 2
9  * of the License, or (at your option) any later version.
10  *
11  * This program is distributed in the hope that it will be useful,
12  * but WITHOUT ANY WARRANTY; without even the implied warranty of
13  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14  * GNU General Public License for more details.
15  *
16  * You should have received a copy of the GNU General Public License
17  * along with this program; if not, write to the Free Software Foundation,
18  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19  *
20  * The Original Code is Copyright (C) 2004 by Blender Foundation.
21  * All rights reserved.
22  *
23  * The Original Code is: all of this file.
24  *
25  * Contributor(s): none yet.
26  *
27  * ***** END GPL LICENSE BLOCK *****
28  */
29
30
31 #include <stdlib.h>
32 #include <string.h>
33 #include <math.h>
34
35 #include "MEM_guardedalloc.h"
36
37 #include "DNA_meshdata_types.h"
38 #include "DNA_object_types.h"
39 #include "DNA_scene_types.h"
40
41 #include "RNA_define.h"
42 #include "RNA_access.h"
43
44 #include "BLI_blenlib.h"
45 #include "BLI_math.h"
46 #include "BLI_editVert.h"
47
48 #include "BKE_context.h"
49 #include "BKE_depsgraph.h"
50 #include "BKE_library.h"
51 #include "BKE_mesh.h"
52 #include "BKE_report.h"
53
54 #include "WM_api.h"
55 #include "WM_types.h"
56
57 #include "ED_mesh.h"
58 #include "ED_screen.h"
59 #include "ED_transform.h"
60 #include "ED_view3d.h"
61 #include "ED_object.h"
62
63 #include "mesh_intern.h"
64
65 /* bpymenu removed XXX */
66
67 /* XXX */
68 #define add_numbut(a, b, c, d, e, f, g) {}
69 /* XXX */
70
71 static float icovert[12][3] = {
72         {0.0f,0.0f,-200.0f}, 
73         {144.72f, -105.144f,-89.443f},
74         {-55.277f, -170.128,-89.443f}, 
75         {-178.885f,0.0f,-89.443f},
76         {-55.277f,170.128f,-89.443f}, 
77         {144.72f,105.144f,-89.443f},
78         {55.277f,-170.128f,89.443f},
79         {-144.72f,-105.144f,89.443f},
80         {-144.72f,105.144f,89.443f},
81         {55.277f,170.128f,89.443f},
82         {178.885f,0.0f,89.443f},
83         {0.0f,0.0f,200.0f}
84 };
85 static short icoface[20][3] = {
86         {1,0,2},
87         {1,0,5},
88         {2,0,3},
89         {3,0,4},
90         {4,0,5},
91         {1,5,10},
92         {2,1,6},
93         {3,2,7},
94         {4,3,8},
95         {5,4,9},
96         {10,1,6},
97         {6,2,7},
98         {7,3,8},
99         {8,4,9},
100         {9,5,10},
101         {6,10,11},
102         {7,6,11},
103         {8,7,11},
104         {9,8,11},
105         {10,9,11}
106 };
107
108 /* *************** add-click-mesh (extrude) operator ************** */
109
110 static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event)
111 {
112         ViewContext vc;
113         EditVert *eve, *v1;
114         float min[3], max[3];
115         int done= 0;
116         
117         em_setup_viewcontext(C, &vc);
118         
119         INIT_MINMAX(min, max);
120         
121         for(v1= vc.em->verts.first;v1; v1=v1->next) {
122                 if(v1->f & SELECT) {
123                         DO_MINMAX(v1->co, min, max);
124                         done= 1;
125                 }
126         }
127
128         /* call extrude? */
129         if(done) {
130                 EditEdge *eed;
131                 float vec[3], cent[3], mat[3][3];
132                 float nor[3]= {0.0, 0.0, 0.0};
133                 
134                 /* check for edges that are half selected, use for rotation */
135                 done= 0;
136                 for(eed= vc.em->edges.first; eed; eed= eed->next) {
137                         if( (eed->v1->f & SELECT)+(eed->v2->f & SELECT) == SELECT ) {
138                                 if(eed->v1->f & SELECT) sub_v3_v3v3(vec, eed->v1->co, eed->v2->co);
139                                 else sub_v3_v3v3(vec, eed->v2->co, eed->v1->co);
140                                 add_v3_v3(nor, vec);
141                                 done= 1;
142                         }
143                 }
144                 if(done) normalize_v3(nor);
145                 
146                 /* center */
147                 add_v3_v3v3(cent, min, max);
148                 mul_v3_fl(cent, 0.5f);
149                 VECCOPY(min, cent);
150                 
151                 mul_m4_v3(vc.obedit->obmat, min);       // view space
152                 view3d_get_view_aligned_coordinate(&vc, min, event->mval);
153                 invert_m4_m4(vc.obedit->imat, vc.obedit->obmat); 
154                 mul_m4_v3(vc.obedit->imat, min); // back in object space
155                 
156                 sub_v3_v3v3(min, min, cent);
157                 
158                 /* calculate rotation */
159                 unit_m3(mat);
160                 if(done) {
161                         float dot;
162                         
163                         VECCOPY(vec, min);
164                         normalize_v3(vec);
165                         dot= INPR(vec, nor);
166
167                         if( fabs(dot)<0.999) {
168                                 float cross[3], si, q1[4];
169                                 
170                                 cross_v3_v3v3(cross, nor, vec);
171                                 normalize_v3(cross);
172                                 dot= 0.5f*saacos(dot);
173                                 si= (float)sin(dot);
174                                 q1[0]= (float)cos(dot);
175                                 q1[1]= cross[0]*si;
176                                 q1[2]= cross[1]*si;
177                                 q1[3]= cross[2]*si;
178                                 
179                                 quat_to_mat3( mat,q1);
180                         }
181                 }
182                 
183                 extrudeflag(vc.obedit, vc.em, SELECT, nor, 0);
184                 rotateflag(vc.em, SELECT, cent, mat);
185                 translateflag(vc.em, SELECT, min);
186                 
187                 recalc_editnormals(vc.em);
188         }
189         else {
190                 float mat[3][3],imat[3][3];
191                 float *curs= give_cursor(vc.scene, vc.v3d);
192                 
193                 VECCOPY(min, curs);
194                 view3d_get_view_aligned_coordinate(&vc, min, event->mval);
195                 
196                 eve= addvertlist(vc.em, 0, NULL);
197
198                 copy_m3_m4(mat, vc.obedit->obmat);
199                 invert_m3_m3(imat, mat);
200                 
201                 VECCOPY(eve->co, min);
202                 mul_m3_v3(imat, eve->co);
203                 sub_v3_v3v3(eve->co, eve->co, vc.obedit->obmat[3]);
204                 
205                 eve->f= SELECT;
206         }
207         
208         //retopo_do_all();
209         WM_event_add_notifier(C, NC_GEOM|ND_DATA, vc.obedit->data); 
210         DAG_id_flush_update(vc.obedit->data, OB_RECALC_DATA);
211         
212         return OPERATOR_FINISHED;
213 }
214
215 void MESH_OT_dupli_extrude_cursor(wmOperatorType *ot)
216 {
217         /* identifiers */
218         ot->name= "Duplicate or Extrude at 3D Cursor";
219         ot->description= "Duplicate and extrude selected vertices, edges or faces towards 3D Cursor";
220         ot->idname= "MESH_OT_dupli_extrude_cursor";
221         
222         /* api callbacks */
223         ot->invoke= dupli_extrude_cursor;
224         ot->poll= ED_operator_editmesh;
225         
226         /* flags */
227         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
228 }
229
230
231 /* ********************** */
232
233 /* selected faces get hidden edges */
234 int make_fgon(EditMesh *em, wmOperator *op, int make)
235 {
236         EditFace *efa;
237         EditEdge *eed;
238         EditVert *eve;
239         float *nor=NULL;        // reference
240         int done=0;
241         
242         if(make==0) {
243                 for(efa= em->faces.first; efa; efa= efa->next) {
244                         if(efa->f & SELECT) {
245                                 efa->fgonf= 0;
246                                 efa->e1->h &= ~EM_FGON;
247                                 efa->e2->h &= ~EM_FGON;
248                                 efa->e3->h &= ~EM_FGON;
249                                 if(efa->e4) efa->e4->h &= ~EM_FGON;
250                                 done= 1;
251                         }
252                 }
253                 EM_fgon_flags(em);      // redo flags and indices for fgons
254                 
255                 return done;
256         }
257
258         /* tagging edges. rule is:
259            - edge used by exactly 2 selected faces
260            - no vertices allowed with only tagged edges (return)
261            - face normals are allowed to difffer
262          
263         */
264         for(eed= em->edges.first; eed; eed= eed->next) {
265                 eed->f1= 0;     // amount of selected
266                 eed->f2= 0; // amount of unselected
267         }
268         
269         for(efa= em->faces.first; efa; efa= efa->next) {
270                 if(efa->f & SELECT) {
271                         if(nor==NULL) nor= efa->n;
272                         if(efa->e1->f1 < 3) efa->e1->f1++;
273                         if(efa->e2->f1 < 3) efa->e2->f1++;
274                         if(efa->e3->f1 < 3) efa->e3->f1++;
275                         if(efa->e4 && efa->e4->f1 < 3) efa->e4->f1++;
276                 }
277                 else {
278                         if(efa->e1->f2 < 3) efa->e1->f2++;
279                         if(efa->e2->f2 < 3) efa->e2->f2++;
280                         if(efa->e3->f2 < 3) efa->e3->f2++;
281                         if(efa->e4 && efa->e4->f2 < 3) efa->e4->f2++;
282                 }
283         }
284         // now eed->f1 becomes tagged edge
285         for(eed= em->edges.first; eed; eed= eed->next) {
286                 if(eed->f1==2 && eed->f2==0) eed->f1= 1;
287                 else eed->f1= 0;
288         }
289         
290         // no vertices allowed with only tagged edges
291         for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0;
292         for(eed= em->edges.first; eed; eed= eed->next) {
293                 if(eed->f1) {
294                         eed->v1->f1 |= 1;
295                         eed->v2->f1 |= 1;
296                 }
297                 else {
298                         eed->v1->f1 |= 2;
299                         eed->v2->f1 |= 2;
300                 }
301         }
302         for(eve= em->verts.first; eve; eve= eve->next) {
303                 if(eve->f1==1) break;
304         }
305         if(eve) {
306                 BKE_report(op->reports, RPT_ERROR, "Cannot make a polygon with interior vertices");
307                 return 0;
308         }
309         
310         // check for faces
311         if(nor==NULL) {
312                 BKE_report(op->reports, RPT_ERROR, "No faces were selected to make FGon");
313                 return 0;
314         }
315
316         // and there we go
317         for(eed= em->edges.first; eed; eed= eed->next) {
318                 if(eed->f1) {
319                         eed->h |= EM_FGON;
320                         done= 1;
321                 }
322         }
323         
324         if(done)
325                 EM_fgon_flags(em);      // redo flags and indices for fgons
326         return done;
327 }
328
329 static int make_fgon_exec(bContext *C, wmOperator *op)
330 {
331         Object *obedit= CTX_data_edit_object(C);
332         EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
333
334         if( make_fgon(em, op, 1) ) {
335                 DAG_id_flush_update(obedit->data, OB_RECALC_DATA);      
336                 WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
337
338                 BKE_mesh_end_editmesh(obedit->data, em);
339                 return OPERATOR_FINISHED;
340         }
341
342         BKE_mesh_end_editmesh(obedit->data, em);
343         return OPERATOR_CANCELLED;
344 }
345
346 void MESH_OT_fgon_make(struct wmOperatorType *ot)
347 {
348         /* identifiers */
349         ot->name= "Make F-gon";
350         ot->description= "Make fgon from selected faces";
351         ot->idname= "MESH_OT_fgon_make";
352         
353         /* api callbacks */
354         ot->exec= make_fgon_exec;
355         ot->poll= ED_operator_editmesh;
356         
357         /* flags */
358         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
359 }
360
361 static int clear_fgon_exec(bContext *C, wmOperator *op)
362 {
363         Object *obedit= CTX_data_edit_object(C);
364         EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
365         
366         if( make_fgon(em, op, 0) ) {
367                 DAG_id_flush_update(obedit->data, OB_RECALC_DATA);      
368                 WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
369                 
370                 BKE_mesh_end_editmesh(obedit->data, em);
371                 return OPERATOR_FINISHED;
372         }
373
374         BKE_mesh_end_editmesh(obedit->data, em);
375         return OPERATOR_CANCELLED;
376 }
377
378 void MESH_OT_fgon_clear(struct wmOperatorType *ot)
379 {
380         /* identifiers */
381         ot->name= "Clear F-gon";
382         ot->description= "Clear fgon from selected face";
383         ot->idname= "MESH_OT_fgon_clear";
384         
385         /* api callbacks */
386         ot->exec= clear_fgon_exec;
387         ot->poll= ED_operator_editmesh;
388         
389         /* flags */
390         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
391 }
392
393 /* precondition; 4 vertices selected, check for 4 edges and create face */
394 static EditFace *addface_from_edges(EditMesh *em)
395 {
396         EditEdge *eed, *eedar[4]={NULL, NULL, NULL, NULL};
397         EditVert *v1=NULL, *v2=NULL, *v3=NULL, *v4=NULL;
398         int a;
399         
400         /* find the 4 edges */
401         for(eed= em->edges.first; eed; eed= eed->next) {
402                 if( (eed->f & SELECT) || (eed->v1->f & eed->v2->f & SELECT) ) {
403                         if(eedar[0]==NULL) eedar[0]= eed;
404                         else if(eedar[1]==NULL) eedar[1]= eed;
405                         else if(eedar[2]==NULL) eedar[2]= eed;
406                         else eedar[3]= eed;
407                         
408                 }
409         }
410         
411         
412         if(eedar[3]) {
413                 /* first 2 points */
414                 v1= eedar[0]->v1;
415                 v2= eedar[0]->v2;
416                 
417                 /* find the 2 edges connected to first edge */
418                 for(a=1; a<4; a++) {
419                         if( eedar[a]->v1 == v2) v3= eedar[a]->v2;
420                         else if(eedar[a]->v2 == v2) v3= eedar[a]->v1;
421                         else if( eedar[a]->v1 == v1) v4= eedar[a]->v2;
422                         else if(eedar[a]->v2 == v1) v4= eedar[a]->v1;
423                 }
424                 
425                 /* verify if last edge exists */
426                 if(v3 && v4) {
427                         for(a=1; a<4; a++) {
428                                 if( eedar[a]->v1==v3 && eedar[a]->v2==v4) break;
429                                 if( eedar[a]->v2==v3 && eedar[a]->v1==v4) break;
430                         }
431                         if(a!=4) {
432                                 return addfacelist(em, v1, v2, v3, v4, NULL, NULL);
433                         }
434                 }
435         }
436         return NULL;
437 }
438
439 /* ******************************* */
440
441 /* this also allows to prevent triangles being made in quads */
442 static int compareface_overlaps(EditFace *vl1, EditFace *vl2)
443 {
444         EditVert *v1, *v2, *v3, *v4;
445         int equal= 0;
446         
447         v1= vl2->v1;
448         v2= vl2->v2;
449         v3= vl2->v3;
450         v4= vl2->v4;
451         
452         if(vl1==vl2) return 0;
453         
454         if(v4==NULL && vl1->v4==NULL) {
455                 if(vl1->v1==v1 || vl1->v2==v1 || vl1->v3==v1) equal++;
456                 if(vl1->v1==v2 || vl1->v2==v2 || vl1->v3==v2) equal++;
457                 if(vl1->v1==v3 || vl1->v2==v3 || vl1->v3==v3) equal++;
458         }
459         else {
460                 if(vl1->v1==v1 || vl1->v2==v1 || vl1->v3==v1 || vl1->v4==v1) equal++;
461                 if(vl1->v1==v2 || vl1->v2==v2 || vl1->v3==v2 || vl1->v4==v2) equal++;
462                 if(vl1->v1==v3 || vl1->v2==v3 || vl1->v3==v3 || vl1->v4==v3) equal++;
463                 if(vl1->v1==v4 || vl1->v2==v4 || vl1->v3==v4 || vl1->v4==v4) equal++;
464         }
465
466         if(v4 && vl1->v4) {
467                 if(equal==4) return 1;
468         }
469         else 
470                 if(equal>=3) return 1;
471         
472         return 0;
473 }
474
475 /* checks for existence, and for tria overlapping inside quad */
476 static EditFace *exist_face_overlaps(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4)
477 {
478         EditFace *efa, efatest;
479         
480         efatest.v1= v1;
481         efatest.v2= v2;
482         efatest.v3= v3;
483         efatest.v4= v4;
484         
485         efa= em->faces.first;
486         while(efa) {
487                 if(compareface_overlaps(&efatest, efa)) return efa;
488                 efa= efa->next;
489         }
490         return NULL;
491 }
492
493 /* will be new face smooth or solid? depends on smoothness of face neighbours
494  * of new face, if function return 1, then new face will be smooth, when functio
495  * will return zero, then new face will be solid */
496 static void fix_new_face(EditMesh *em, EditFace *eface)
497 {
498         struct EditFace *efa;
499         struct EditEdge *eed=NULL;
500         struct EditVert *v1 = eface->v1, *v2 = eface->v2, *v3 = eface->v3, *v4 = eface->v4;
501         struct EditVert *ev1=NULL, *ev2=NULL;
502         short smooth=0; /* "total smoothnes" of faces in neighbourhood */
503         short coef;     /* "weight" of smoothness */
504         short count=0;  /* number of edges with same direction as eface */
505         short vi00=0, vi01=0, vi10=0, vi11=0; /* vertex indexes */
506
507         efa = em->faces.first;
508
509         while(efa) {
510
511                 if(efa==eface) {
512                         efa = efa->next;
513                         continue;
514                 }
515
516                 coef = 0;
517                 ev1 = ev2 = NULL;
518                 eed = NULL;
519
520                 if(efa->v1==v1 || efa->v2==v1 || efa->v3==v1 || efa->v4==v1) {
521                         ev1 = v1;
522                         coef++;
523                 }
524                 if(efa->v1==v2 || efa->v2==v2 || efa->v3==v2 || efa->v4==v2) {
525                         if(ev1) ev2 = v2;
526                         else ev1 = v2;
527                         coef++;
528                 }
529                 if(efa->v1==v3 || efa->v2==v3 || efa->v3==v3 || efa->v4==v3) {
530                         if(coef<2) {
531                                 if(ev1) ev2 = v3;
532                                 else ev1 = v3;
533                         }
534                         coef++;
535                 }
536                 if((v4) && (efa->v1==v4 || efa->v2==v4 || efa->v3==v4 || efa->v4==v4)) {
537                         if(ev1 && coef<2) ev2 = v4;
538                         coef++;
539                 }
540
541                 /* "democracy" of smoothness */
542                 if(efa->flag & ME_SMOOTH)
543                         smooth += coef;
544                 else
545                         smooth -= coef;
546
547                 /* try to find edge using vertexes ev1 and ev2 */
548                 if((ev1) && (ev2) && (ev1!=ev2)) eed = findedgelist(em, ev1, ev2);
549
550                 /* has bordering edge of efa same direction as edge of eface ? */
551                 if(eed) {
552                         if(eed->v1==v1) vi00 = 1;
553                         else if(eed->v1==v2) vi00 = 2;
554                         else if(eed->v1==v3) vi00 = 3;
555                         else if(v4 && eed->v1==v4) vi00 = 4;
556
557                         if(eed->v2==v1) vi01 = 1;
558                         else if(eed->v2==v2) vi01 = 2;
559                         else if(eed->v2==v3) vi01 = 3;
560                         else if(v4 && eed->v2==v4) vi01 = 4;
561
562                         if(v4) {
563                                 if(vi01==1 && vi00==4) vi00 = 0;
564                                 if(vi01==4 && vi00==1) vi01 = 0;
565                         }
566                         else {
567                                 if(vi01==1 && vi00==3) vi00 = 0;
568                                 if(vi01==3 && vi00==1) vi01 = 0;
569                         }
570
571                         if(eed->v1==efa->v1) vi10 = 1;
572                         else if(eed->v1==efa->v2) vi10 = 2;
573                         else if(eed->v1==efa->v3) vi10 = 3;
574                         else if(efa->v4 && eed->v1==efa->v4) vi10 = 4;
575
576                         if(eed->v2==efa->v1) vi11 = 1;
577                         else if(eed->v2==efa->v2) vi11 = 2;
578                         else if(eed->v2==efa->v3) vi11 = 3;
579                         else if(efa->v4 && eed->v2==efa->v4) vi11 = 4;
580
581                         if(efa->v4) {
582                                 if(vi11==1 && vi10==4) vi10 = 0;
583                                 if(vi11==4 && vi10==1) vi11 = 0;
584                         }
585                         else {
586                                 if(vi11==1 && vi10==3) vi10 = 0;
587                                 if(vi11==3 && vi10==1) vi11 = 0;
588                         }
589
590                         if(((vi00>vi01) && (vi10>vi11)) ||
591                                 ((vi00<vi01) && (vi10<vi11)))
592                                 count++;
593                         else
594                                 count--;
595                 }
596
597                 efa = efa->next;
598         }
599
600         /* set up smoothness according voting of face in neighbourhood */
601         if(smooth >= 0)
602                 eface->flag |= ME_SMOOTH;
603         else
604                 eface->flag &= ~ME_SMOOTH;
605
606         /* flip face, when too much "face normals" in neighbourhood is different */
607         if(count > 0) {
608                 flipface(em, eface);
609         }
610 }
611
612 /* only adds quads or trias when there's edges already */
613 void addfaces_from_edgenet(EditMesh *em)
614 {
615         EditVert *eve1, *eve2, *eve3, *eve4;
616         
617         for(eve1= em->verts.first; eve1; eve1= eve1->next) {
618                 for(eve2= em->verts.first; (eve1->f & 1) && eve2; eve2= eve2->next) {
619                         if(findedgelist(em, eve1,eve2)) {
620                                 for(eve3= em->verts.first; (eve2->f & 1) && eve3; eve3= eve3->next) {
621                                         if((eve2!=eve3 && (eve3->f & 1) && findedgelist(em, eve1,eve3))) {
622                                                 EditEdge *sh_edge= NULL;
623                                                 EditVert *sh_vert= NULL;
624                                                 
625                                                 sh_edge= findedgelist(em, eve2,eve3);
626                                                 
627                                                 if(sh_edge) { /* Add a triangle */
628                                                         if(!exist_face_overlaps(em, eve1,eve2,eve3,NULL))
629                                                                 fix_new_face(em, addfacelist(em, eve1,eve2,eve3,NULL,NULL,NULL));
630                                                 }
631                                                 else { /* Check for a shared vertex */
632                                                         for(eve4= em->verts.first; eve4; eve4= eve4->next) {
633                                                                 if(eve4!=eve1 && eve4!=eve2 && eve4!=eve3 && (eve4->f & 1) &&
634                                                                    !findedgelist(em, eve1,eve4) && findedgelist(em, eve2,eve4) &&
635                                                                    findedgelist(em, eve3,eve4)) {
636                                                                         sh_vert= eve4;
637                                                                         break;
638                                                                 }
639                                                         }
640                                                         
641                                                         if(sh_vert) {
642                                                                 if(sh_vert) {
643                                                                         if(!exist_face_overlaps(em, eve1,eve2,eve4,eve3))
644                                                                                 fix_new_face(em, addfacelist(em, eve1,eve2,eve4,eve3,NULL,NULL));
645                                                                 }
646                                                         }
647                                                 }
648                                         }
649                                 }
650                         }
651                 }
652         }
653
654         EM_select_flush(em);
655         
656 // XXX  DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
657 }
658
659 static void addedgeface_mesh(EditMesh *em, wmOperator *op)
660 {
661         EditVert *eve, *neweve[4];
662         EditEdge *eed;
663         EditFace *efa;
664         short amount=0;
665
666         /* how many selected ? */
667         if(em->selectmode & SCE_SELECT_EDGE) {
668                 /* in edge mode finding selected vertices means flushing down edge codes... */
669                 /* can't make face with only edge selection info... */
670                 EM_selectmode_set(em);
671         }
672         
673         for(eve= em->verts.first; eve; eve= eve->next) {
674                 if(eve->f & SELECT) {
675                         amount++;
676                         if(amount>4) break;                     
677                         neweve[amount-1]= eve;
678                 }
679         }
680
681         if(amount==2) {
682                 eed= addedgelist(em, neweve[0], neweve[1], NULL);
683                 EM_select_edge(eed, 1);
684
685                 // XXX          DAG_id_flush_update(obedit->data, OB_RECALC_DATA);      
686                 return;
687         }
688         else if(amount > 4) {
689                 addfaces_from_edgenet(em);
690                 return;
691         }
692         else if(amount<2) {
693                 BKE_report(op->reports, RPT_ERROR, "More vertices are needed to make an edge/face");
694                 return;
695         }
696
697         efa= NULL; // check later
698
699         if(amount==3) {
700                 
701                 if(exist_face_overlaps(em, neweve[0], neweve[1], neweve[2], NULL)==0) {
702                         efa= addfacelist(em, neweve[0], neweve[1], neweve[2], 0, NULL, NULL);
703                         EM_select_face(efa, 1);
704                 }
705                 else BKE_report(op->reports, RPT_ERROR, "The selected vertices already form a face");
706         }
707         else if(amount==4) {
708                 /* this test survives when theres 2 triangles */
709                 if(exist_face(em, neweve[0], neweve[1], neweve[2], neweve[3])==0) {
710                         int tria= 0;
711                         
712                         /* remove trias if they exist, 4 cases.... */
713                         if(exist_face(em, neweve[0], neweve[1], neweve[2], NULL)) tria++;
714                         if(exist_face(em, neweve[0], neweve[1], neweve[3], NULL)) tria++;
715                         if(exist_face(em, neweve[0], neweve[2], neweve[3], NULL)) tria++;
716                         if(exist_face(em, neweve[1], neweve[2], neweve[3], NULL)) tria++;
717                 
718                         if(tria==2) join_triangles(em);
719                         else if(exist_face_overlaps(em, neweve[0], neweve[1], neweve[2], neweve[3])==0) {
720                                  /* If there are 4 Verts, But more selected edges, we need to call addfaces_from_edgenet */
721                                         EditEdge *eedcheck;
722                                         int count;
723                                         count = 0;
724                                         for(eedcheck= em->edges.first; eedcheck; eedcheck= eedcheck->next) {
725                                                 if(eedcheck->f & SELECT) {
726                                                         count++;
727                                                 }
728                                         }       
729                                 
730                                 if(count++ > 4){
731                                         addfaces_from_edgenet(em);
732                                         return;
733                                 } else {
734                                 /* if 4 edges exist, we just create the face, convex or not */
735                                         efa= addface_from_edges(em);
736                                         if(efa==NULL) {
737                                                 
738                                                 /* the order of vertices can be anything, 6 cases to check */
739                                                 if( convex(neweve[0]->co, neweve[1]->co, neweve[2]->co, neweve[3]->co) ) {
740                                                         efa= addfacelist(em, neweve[0], neweve[1], neweve[2], neweve[3], NULL, NULL);
741                                                 }
742                                                 else if( convex(neweve[0]->co, neweve[2]->co, neweve[3]->co, neweve[1]->co) ) {
743                                                         efa= addfacelist(em, neweve[0], neweve[2], neweve[3], neweve[1], NULL, NULL);
744                                                 }
745                                                 else if( convex(neweve[0]->co, neweve[2]->co, neweve[1]->co, neweve[3]->co) ) {
746                                                         efa= addfacelist(em, neweve[0], neweve[2], neweve[1], neweve[3], NULL, NULL);
747                                                 }
748                                                 else if( convex(neweve[0]->co, neweve[1]->co, neweve[3]->co, neweve[2]->co) ) {
749                                                         efa= addfacelist(em, neweve[0], neweve[1], neweve[3], neweve[2], NULL, NULL);
750                                                 }
751                                                 else if( convex(neweve[0]->co, neweve[3]->co, neweve[2]->co, neweve[1]->co) ) {
752                                                         efa= addfacelist(em, neweve[0], neweve[3], neweve[2], neweve[1], NULL, NULL);
753                                                 }
754                                                 else if( convex(neweve[0]->co, neweve[3]->co, neweve[1]->co, neweve[2]->co) ) {
755                                                         efa= addfacelist(em, neweve[0], neweve[3], neweve[1], neweve[2], NULL, NULL);
756                                                 }
757                                                 else BKE_report(op->reports, RPT_ERROR, "cannot find nice quad from concave set of vertices");
758
759                                         }
760                                 }
761                         }
762                         else BKE_report(op->reports, RPT_ERROR, "The selected vertices already form a face");
763                 }
764                 else BKE_report(op->reports, RPT_ERROR, "The selected vertices already form a face");
765         }
766         
767         if(efa) {
768                 EM_select_face(efa, 1);
769
770                 fix_new_face(em, efa);
771                 
772                 recalc_editnormals(em);
773         }
774         }
775
776 static int addedgeface_mesh_exec(bContext *C, wmOperator *op)
777 {
778         Object *obedit= CTX_data_edit_object(C);
779         EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
780         
781         addedgeface_mesh(em, op);
782         
783         DAG_id_flush_update(obedit->data, OB_RECALC_DATA);      
784         WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
785         
786         BKE_mesh_end_editmesh(obedit->data, em);
787         return OPERATOR_FINISHED;
788 }
789
790 void MESH_OT_edge_face_add(wmOperatorType *ot)
791 {
792         /* identifiers */
793         ot->name= "Make Edge/Face";
794         ot->description= "Add an edge or face to selected";
795         ot->idname= "MESH_OT_edge_face_add";
796         
797         /* api callbacks */
798         ot->exec= addedgeface_mesh_exec;
799         ot->poll= ED_operator_editmesh;
800         
801         /* flags */
802         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
803         
804 }
805
806
807
808 /* ************************ primitives ******************* */
809
810 // HACK: these can also be found in cmoview.tga.c, but are here so that they can be found by linker
811 // this hack is only used so that scons+mingw + split-sources hack works
812         // ------------------------------- start copied code
813 /* these are not the monkeys you are looking for */
814 int monkeyo= 4;
815 int monkeynv= 271;
816 int monkeynf= 250;
817 signed char monkeyv[271][3]= {
818 {-71,21,98},{-63,12,88},{-57,7,74},{-82,-3,79},{-82,4,92},
819 {-82,17,100},{-92,21,102},{-101,12,95},{-107,7,83},
820 {-117,31,84},{-109,31,95},{-96,31,102},{-92,42,102},
821 {-101,50,95},{-107,56,83},{-82,66,79},{-82,58,92},
822 {-82,46,100},{-71,42,98},{-63,50,88},{-57,56,74},
823 {-47,31,72},{-55,31,86},{-67,31,97},{-66,31,99},
824 {-70,43,100},{-82,48,103},{-93,43,105},{-98,31,105},
825 {-93,20,105},{-82,31,106},{-82,15,103},{-70,20,100},
826 {-127,55,95},{-127,45,105},{-127,-87,94},{-127,-41,100},
827 {-127,-24,102},{-127,-99,92},{-127,52,77},{-127,73,73},
828 {-127,115,-70},{-127,72,-109},{-127,9,-106},{-127,-49,-45},
829 {-101,-24,72},{-87,-56,73},{-82,-89,73},{-80,-114,68},
830 {-85,-121,67},{-104,-124,71},{-127,-126,74},{-71,-18,68},
831 {-46,-5,69},{-21,19,57},{-17,55,76},{-36,62,80},
832 {-64,77,88},{-86,97,94},{-107,92,97},{-119,63,96},
833 {-106,53,99},{-111,39,98},{-101,12,95},{-79,2,90},
834 {-64,8,86},{-47,24,83},{-45,38,83},{-50,48,85},
835 {-72,56,92},{-95,60,97},{-127,-98,94},{-113,-92,94},
836 {-112,-107,91},{-119,-113,89},{-127,-114,88},{-127,-25,96},
837 {-127,-18,95},{-114,-19,95},{-111,-29,96},{-116,-37,95},
838 {-76,-6,86},{-48,7,80},{-34,26,77},{-32,48,84},
839 {-39,53,93},{-71,70,102},{-87,82,107},{-101,79,109},
840 {-114,55,108},{-111,-13,104},{-100,-57,91},{-95,-90,88},
841 {-93,-105,85},{-97,-117,81},{-106,-119,81},{-127,-121,82},
842 {-127,6,93},{-127,27,98},{-85,61,95},{-106,18,96},
843 {-110,27,97},{-112,-88,94},{-117,-57,96},{-127,-57,96},
844 {-127,-42,95},{-115,-35,100},{-110,-29,102},{-113,-17,100},
845 {-122,-16,100},{-127,-26,106},{-121,-19,104},{-115,-20,104},
846 {-113,-29,106},{-117,-32,103},{-127,-37,103},{-94,-40,71},
847 {-106,-31,91},{-104,-40,91},{-97,-32,71},{-127,-112,88},
848 {-121,-111,88},{-115,-105,91},{-115,-95,93},{-127,-100,84},
849 {-115,-96,85},{-115,-104,82},{-121,-109,81},{-127,-110,81},
850 {-105,28,100},{-103,20,99},{-84,55,97},{-92,54,99},
851 {-73,51,99},{-55,45,89},{-52,37,88},{-53,25,87},
852 {-66,13,92},{-79,8,95},{-98,14,100},{-104,38,100},
853 {-100,48,100},{-97,46,97},{-102,38,97},{-96,16,97},
854 {-79,11,93},{-68,15,90},{-57,27,86},{-56,36,86},
855 {-59,43,87},{-74,50,96},{-91,51,98},{-84,52,96},
856 {-101,22,96},{-102,29,96},{-113,59,78},{-102,85,79},
857 {-84,88,76},{-65,71,71},{-40,58,63},{-25,52,59},
858 {-28,21,48},{-50,0,53},{-71,-12,60},{-127,115,37},
859 {-127,126,-10},{-127,-25,-86},{-127,-59,24},{-127,-125,59},
860 {-127,-103,44},{-127,-73,41},{-127,-62,36},{-18,30,7},
861 {-17,41,-6},{-28,34,-56},{-68,56,-90},{-33,-6,9},
862 {-51,-16,-21},{-45,-1,-55},{-84,7,-85},{-97,-45,52},
863 {-104,-53,33},{-90,-91,49},{-95,-64,50},{-85,-117,51},
864 {-109,-97,47},{-111,-69,46},{-106,-121,56},{-99,-36,55},
865 {-100,-29,60},{-101,-22,64},{-100,-50,21},{-89,-40,-34},
866 {-83,-19,-69},{-69,111,-49},{-69,119,-9},{-69,109,30},
867 {-68,67,55},{-34,52,43},{-46,58,36},{-45,90,7},
868 {-25,72,16},{-25,79,-15},{-45,96,-25},{-45,87,-57},
869 {-25,69,-46},{-48,42,-75},{-65,3,-70},{-22,42,-26},
870 {-75,-22,19},{-72,-25,-27},{-13,52,-30},{-28,-18,-16},
871 {6,-13,-42},{37,7,-55},{46,41,-54},{31,65,-54},
872 {4,61,-40},{3,53,-37},{25,56,-50},{35,37,-52},
873 {28,10,-52},{5,-5,-39},{-21,-9,-17},{-9,46,-28},
874 {-6,39,-37},{-14,-3,-27},{6,0,-47},{25,12,-57},
875 {31,32,-57},{23,46,-56},{4,44,-46},{-19,37,-27},
876 {-20,22,-35},{-30,12,-35},{-22,11,-35},{-19,2,-35},
877 {-23,-2,-35},{-34,0,-9},{-35,-3,-22},{-35,5,-24},
878 {-25,26,-27},{-13,31,-34},{-13,30,-41},{-23,-2,-41},
879 {-18,2,-41},{-21,10,-41},{-29,12,-41},{-19,22,-41},
880 {6,42,-53},{25,44,-62},{34,31,-63},{28,11,-62},
881 {7,0,-54},{-14,-2,-34},{-5,37,-44},{-13,14,-42},
882 {-7,8,-43},{1,16,-47},{-4,22,-45},{3,30,-48},
883 {8,24,-49},{15,27,-50},{12,35,-50},{4,56,-62},
884 {33,60,-70},{48,38,-64},{41,7,-68},{6,-11,-63},
885 {-26,-16,-42},{-17,49,-49},
886 };
887
888 signed char monkeyf[250][4]= {
889 {27,4,5,26}, {25,4,5,24}, {3,6,5,4}, {1,6,5,2}, {5,6,7,4}, 
890 {3,6,7,2}, {5,8,7,6}, {3,8,7,4}, {7,8,9,6}, 
891 {5,8,9,4}, {7,10,9,8}, {5,10,9,6}, {9,10,11,8}, 
892 {7,10,11,6}, {9,12,11,10}, {7,12,11,8}, {11,6,13,12}, 
893 {5,4,13,12}, {3,-2,13,12}, {-3,-4,13,12}, {-5,-10,13,12}, 
894 {-11,-12,14,12}, {-13,-18,14,13}, {-19,4,5,13}, {10,12,4,4}, 
895 {10,11,9,9}, {8,7,9,9}, {7,5,6,6}, {6,3,4,4}, 
896 {5,1,2,2}, {4,-1,0,0}, {3,-3,-2,-2}, {22,67,68,23}, 
897 {20,65,66,21}, {18,63,64,19}, {16,61,62,17}, {14,59,60,15}, 
898 {12,19,48,57}, {18,19,48,47}, {18,19,48,47}, {18,19,48,47}, 
899 {18,19,48,47}, {18,19,48,47}, {18,19,48,47}, {18,19,48,47}, 
900 {18,19,48,47}, {18,-9,-8,47}, {18,27,45,46}, {26,55,43,44}, 
901 {24,41,42,54}, {22,39,40,23}, {20,37,38,21}, {18,35,36,19}, 
902 {16,33,34,17}, {14,31,32,15}, {12,39,30,13}, {11,48,45,38}, 
903 {8,36,-19,9}, {8,-20,44,47}, {42,45,46,43}, {18,19,40,39}, 
904 {16,17,38,37}, {14,15,36,35}, {32,44,43,33}, {12,33,32,42}, 
905 {19,44,43,42}, {40,41,42,-27}, {8,9,39,-28}, {15,43,42,16}, 
906 {13,43,42,14}, {11,43,42,12}, {9,-30,42,10}, {37,12,38,-32}, 
907 {-33,37,45,46}, {-33,40,41,39}, {38,40,41,37}, {36,40,41,35}, 
908 {34,40,41,33}, {36,39,38,37}, {35,40,39,38}, {1,2,14,21}, 
909 {1,2,40,13}, {1,2,40,39}, {1,24,12,39}, {-34,36,38,11}, 
910 {35,38,36,37}, {-37,8,35,37}, {-11,-12,-45,40}, {-11,-12,39,38}, 
911 {-11,-12,37,36}, {-11,-12,35,34}, {33,34,40,41}, {33,34,38,39}, 
912 {33,34,36,37}, {33,-52,34,35}, {33,37,36,34}, {33,35,34,34}, 
913 {8,7,37,36}, {-32,7,35,46}, {-34,-33,45,46}, {4,-33,43,34}, 
914 {-34,-33,41,42}, {-34,-33,39,40}, {-34,-33,37,38}, {-34,-33,35,36}, 
915 {-34,-33,33,34}, {-34,-33,31,32}, {-34,-4,28,30}, {-5,-34,28,27}, 
916 {-35,-44,36,27}, {26,35,36,45}, {24,25,44,45}, {25,23,44,42}, 
917 {25,24,41,40}, {25,24,39,38}, {25,24,37,36}, {25,24,35,34}, 
918 {25,24,33,32}, {25,24,31,30}, {15,24,29,38}, {25,24,27,26}, 
919 {23,12,37,26}, {11,12,35,36}, {-86,-59,36,-80}, {-60,-61,36,35}, 
920 {-62,-63,36,35}, {-64,-65,36,35}, {-66,-67,36,35}, {-68,-69,36,35}, 
921 {-70,-71,36,35}, {-72,-73,36,35}, {-74,-75,36,35}, {42,43,53,58}, 
922 {40,41,57,56}, {38,39,55,57}, {-81,-80,37,56}, {-83,-82,55,52}, 
923 {-85,-84,51,49}, {-87,-86,48,49}, {47,50,51,48}, {46,48,51,49}, 
924 {43,46,49,44}, {-92,-91,45,42}, {-23,49,50,-20}, {-94,40,48,-24}, 
925 {-96,-22,48,49}, {-97,48,21,-90}, {-100,36,50,23}, {22,49,48,-100}, 
926 {-101,47,46,22}, {21,45,35,25}, {33,34,44,41}, {13,14,28,24}, 
927 {-107,26,30,-106}, {14,46,45,15}, {14,44,43,-110}, {-111,42,23,-110}, 
928 {6,7,45,46}, {45,44,47,46}, {45,46,47,48}, {47,46,49,48}, 
929 {17,49,47,48}, {17,36,46,48}, {35,36,44,45}, {35,36,40,43}, 
930 {35,36,38,39}, {-4,-3,37,35}, {-123,34,33,1}, {-9,-8,-7,-6}, 
931 {-10,-7,32,-125}, {-127,-11,-126,-126}, {-7,-6,5,31}, {4,5,33,30}, 
932 {4,39,33,32}, {4,35,32,38}, {20,21,39,38}, {4,37,38,5}, 
933 {-11,-10,36,3}, {-11,15,14,35}, {13,16,34,34}, {-13,14,13,13}, 
934 {-3,1,30,29}, {-3,28,29,1}, {-2,31,28,-1}, {12,13,27,30}, 
935 {-2,26,12,12}, {35,29,42,36}, {34,35,36,33}, {32,35,36,31}, 
936 {30,35,36,29}, {28,35,36,27}, {26,35,36,25}, {34,39,38,35}, 
937 {32,39,38,33}, {30,39,38,31}, {28,39,38,29}, {26,39,38,27}, 
938 {25,31,32,38}, {-18,-17,45,44}, {-18,17,28,44}, {-24,-20,42,-23}, 
939 {11,35,27,14}, {25,28,39,41}, {37,41,40,38}, {34,40,36,35}, 
940 {32,40,39,33}, {30,39,31,40}, {21,29,39,22}, {-31,37,28,4}, 
941 {-32,33,35,36}, {32,33,34,34}, {18,35,36,48}, {34,25,40,35}, 
942 {24,25,38,39}, {24,25,36,37}, {24,25,34,35}, {24,25,32,33}, 
943 {24,13,41,31}, {17,11,41,35}, {15,16,34,35}, {13,14,34,35}, 
944 {11,12,34,35}, {9,10,34,35}, {7,8,34,35}, {26,25,37,36}, 
945 {35,36,37,38}, {37,36,39,38}, {37,38,39,40}, {25,31,36,39}, 
946 {18,34,35,30}, {17,22,30,33}, {19,29,21,20}, {16,26,29,17}, 
947 {24,29,28,25}, {22,31,28,23}, {20,31,30,21}, {18,31,30,19}, 
948 {16,30,17,17}, {-21,-22,35,34}, {-21,-22,33,32}, {-21,-22,31,30}, 
949 {-21,-22,29,28}, {-21,-22,27,26}, {-28,-22,25,31}, {24,28,29,30}, 
950 {23,24,26,27}, {23,24,25,25}, {-69,-35,-32,27}, {-70,26,25,-66}, 
951 {-68,-67,24,-33}, 
952 };
953         // ------------------------------- end copied code
954
955
956 #define PRIM_PLANE              0
957 #define PRIM_CUBE               1
958 #define PRIM_CIRCLE             4
959 #define PRIM_CYLINDER   5
960 #define PRIM_CONE               7
961 #define PRIM_GRID               10
962 #define PRIM_UVSPHERE   11
963 #define PRIM_ICOSPHERE  12
964 #define PRIM_MONKEY             13
965
966 static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int seg,
967                 int subdiv, float dia, float depth, int ext, int fill)
968 {
969         /*
970          * type - for the type of shape
971          * dia - the radius for cone,sphere cylinder etc.
972          * depth - 
973          * ext - extrude
974          * fill - end capping, and option to fill in circle
975          * cent[3] - center of the data. 
976          * */
977         EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
978         EditVert *eve, *v1=NULL, *v2, *v3, *v4=NULL, *vtop, *vdown;
979         float phi, phid, vec[3];
980         float q[4], cmat[3][3], nor[3]= {0.0, 0.0, 0.0};
981         short a, b;
982         
983         EM_clear_flag_all(em, SELECT);
984
985         phid= 2.0f*(float)M_PI/tot;
986         phi= .25f*(float)M_PI;
987
988         switch(type) {
989         case PRIM_GRID: /*  grid */
990                 /* clear flags */
991                 eve= em->verts.first;
992                 while(eve) {
993                         eve->f= 0;
994                         eve= eve->next;
995                 }
996                 
997                 /* one segment first: the X axis */             
998                 phi = (2*dia)/(float)(tot-1);
999                 phid = (2*dia)/(float)(seg-1);
1000                 for(a=0;a<tot;a++) {
1001                         vec[0] = (phi*a) - dia;
1002                         vec[1]= - dia;
1003                         vec[2]= 0.0f;
1004                         eve= addvertlist(em, vec, NULL);
1005                         eve->f= 1+2+4;
1006                         if (a) {
1007                                 addedgelist(em, eve->prev, eve, NULL);
1008                         }
1009                 }
1010                 /* extrude and translate */
1011                 vec[0]= vec[2]= 0.0;
1012                 vec[1]= phid;
1013                 
1014                 for(a=0;a<seg-1;a++) {
1015                         extrudeflag_vert(obedit, em, 2, nor, 0);        // nor unused
1016                         translateflag(em, 2, vec);
1017                 }
1018                 break;
1019         case PRIM_UVSPHERE: /*  UVsphere */
1020                 
1021                 /* clear all flags */
1022                 eve= em->verts.first;
1023                 while(eve) {
1024                         eve->f= 0;
1025                         eve= eve->next;
1026                 }
1027                 
1028                 /* one segment first */
1029                 phi= 0; 
1030                 phid/=2;
1031                 for(a=0; a<=tot; a++) {
1032                         vec[0]= dia*sin(phi);
1033                         vec[1]= 0.0;
1034                         vec[2]= dia*cos(phi);
1035                         eve= addvertlist(em, vec, NULL);
1036                         eve->f= 1+2+4;
1037                         if(a==0) v1= eve;
1038                         else addedgelist(em, eve->prev, eve, NULL);
1039                         phi+= phid;
1040                 }
1041                 
1042                 /* extrude and rotate */
1043                 phi= M_PI/seg;
1044                 q[0]= cos(phi);
1045                 q[3]= sin(phi);
1046                 q[1]=q[2]= 0;
1047                 quat_to_mat3( cmat,q);
1048                 
1049                 for(a=0; a<seg; a++) {
1050                         extrudeflag_vert(obedit, em, 2, nor, 0); // nor unused
1051                         rotateflag(em, 2, v1->co, cmat);
1052                 }
1053
1054                 removedoublesflag(em, 4, 0, 0.0001);
1055
1056                 /* and now do imat */
1057                 eve= em->verts.first;
1058                 while(eve) {
1059                         if(eve->f & SELECT) {
1060                                 mul_m4_v3(mat,eve->co);
1061                         }
1062                         eve= eve->next;
1063                 }
1064                 break;
1065         case PRIM_ICOSPHERE: /* Icosphere */
1066                 {
1067                         EditVert *eva[12];
1068                         EditEdge *eed;
1069                         
1070                         /* clear all flags */
1071                         eve= em->verts.first;
1072                         while(eve) {
1073                                 eve->f= 0;
1074                                 eve= eve->next;
1075                         }
1076                         dia/=200;
1077                         for(a=0;a<12;a++) {
1078                                 vec[0]= dia*icovert[a][0];
1079                                 vec[1]= dia*icovert[a][1];
1080                                 vec[2]= dia*icovert[a][2];
1081                                 eva[a]= addvertlist(em, vec, NULL);
1082                                 eva[a]->f= 1+2;
1083                         }
1084                         for(a=0;a<20;a++) {
1085                                 EditFace *evtemp;
1086                                 v1= eva[ icoface[a][0] ];
1087                                 v2= eva[ icoface[a][1] ];
1088                                 v3= eva[ icoface[a][2] ];
1089                                 evtemp = addfacelist(em, v1, v2, v3, 0, NULL, NULL);
1090                                 evtemp->e1->f = 1+2;
1091                                 evtemp->e2->f = 1+2;
1092                                 evtemp->e3->f = 1+2;
1093                         }
1094
1095                         dia*=200;
1096                         for(a=1; a<subdiv; a++) esubdivideflag(obedit, em, 2, dia, 0, B_SPHERE,1, SUBDIV_CORNER_PATH, 0);
1097                         /* and now do imat */
1098                         eve= em->verts.first;
1099                         while(eve) {
1100                                 if(eve->f & 2) {
1101                                         mul_m4_v3(mat,eve->co);
1102                                 }
1103                                 eve= eve->next;
1104                         }
1105                         
1106                         // Clear the flag 2 from the edges
1107                         for(eed=em->edges.first;eed;eed=eed->next){
1108                                 if(eed->f & 2){
1109                                            eed->f &= !2;
1110                                 }   
1111                         }
1112                 }
1113                 break;
1114         case PRIM_MONKEY: /* Monkey */
1115                 {
1116                         //extern int monkeyo, monkeynv, monkeynf;
1117                         //extern signed char monkeyf[][4];
1118                         //extern signed char monkeyv[][3];
1119                         EditVert **tv= MEM_mallocN(sizeof(*tv)*monkeynv*2, "tv");
1120                         int i;
1121
1122                         for (i=0; i<monkeynv; i++) {
1123                                 float v[3];
1124                                 v[0]= (monkeyv[i][0]+127)/128.0, v[1]= monkeyv[i][1]/128.0, v[2]= monkeyv[i][2]/128.0;
1125                                 tv[i]= addvertlist(em, v, NULL);
1126                                 tv[i]->f |= SELECT;
1127                                 tv[monkeynv+i]= (fabs(v[0]= -v[0])<0.001)?tv[i]:addvertlist(em, v, NULL);
1128                                 tv[monkeynv+i]->f |= SELECT;
1129                         }
1130                         for (i=0; i<monkeynf; i++) {
1131                                 addfacelist(em, tv[monkeyf[i][0]+i-monkeyo], tv[monkeyf[i][1]+i-monkeyo], tv[monkeyf[i][2]+i-monkeyo], (monkeyf[i][3]!=monkeyf[i][2])?tv[monkeyf[i][3]+i-monkeyo]:NULL, NULL, NULL);
1132                                 addfacelist(em, tv[monkeynv+monkeyf[i][2]+i-monkeyo], tv[monkeynv+monkeyf[i][1]+i-monkeyo], tv[monkeynv+monkeyf[i][0]+i-monkeyo], (monkeyf[i][3]!=monkeyf[i][2])?tv[monkeynv+monkeyf[i][3]+i-monkeyo]:NULL, NULL, NULL);
1133                         }
1134
1135                         MEM_freeN(tv);
1136
1137                         /* and now do imat */
1138                         for(eve= em->verts.first; eve; eve= eve->next) {
1139                                 if(eve->f & SELECT) {
1140                                         mul_m4_v3(mat,eve->co);
1141                                 }
1142                         }
1143                         recalc_editnormals(em);
1144                 }
1145                 break;
1146         default: /* all types except grid, sphere... */
1147                 if(type==PRIM_CONE);
1148                 else if(ext==0) 
1149                         depth= 0.0f;
1150         
1151                 /* vertices */
1152                 vtop= vdown= v1= v2= 0;
1153                 for(b=0; b<=ext; b++) {
1154                         for(a=0; a<tot; a++) {
1155                                 
1156                                 vec[0]= dia*sin(phi);
1157                                 vec[1]= dia*cos(phi);
1158                                 vec[2]= b?depth:-depth;
1159                                 
1160                                 mul_m4_v3(mat, vec);
1161                                 eve= addvertlist(em, vec, NULL);
1162                                 eve->f= SELECT;
1163                                 if(a==0) {
1164                                         if(b==0) v1= eve;
1165                                         else v2= eve;
1166                                 }
1167                                 phi+=phid;
1168                         }
1169                 }
1170                         
1171                 /* center vertices */
1172                 /* type PRIM_CONE can only have 1 one side filled
1173                  * if the cone has no capping, dont add vtop */
1174                 if(type == PRIM_CONE || (fill && !ELEM(type, PRIM_PLANE, PRIM_CUBE))) {
1175                         vec[0]= vec[1]= 0.0f;
1176                         vec[2]= type==PRIM_CONE ? depth : -depth;
1177                         mul_m4_v3(mat, vec);
1178                         vdown= addvertlist(em, vec, NULL);
1179                         if((ext || type==PRIM_CONE) && fill) {
1180                                 vec[0]= vec[1]= 0.0f;
1181                                 vec[2]= type==PRIM_CONE ? -depth : depth;
1182                                 mul_m4_v3(mat,vec);
1183                                 vtop= addvertlist(em, vec, NULL);
1184                         }
1185                 } else {
1186                         vdown= v1;
1187                         vtop= v2;
1188                 }
1189                 if(vtop) vtop->f= SELECT;
1190                 if(vdown) vdown->f= SELECT;
1191         
1192                 /* top and bottom face */
1193                 if(fill || type==PRIM_CONE) {
1194                         if(tot==4 && ELEM(type, PRIM_PLANE, PRIM_CUBE)) {
1195                                 v3= v1->next->next;
1196                                 if(ext) v4= v2->next->next;
1197                                 
1198                                 addfacelist(em, v3, v1->next, v1, v3->next, NULL, NULL);
1199                                 if(ext) addfacelist(em, v2, v2->next, v4, v4->next, NULL, NULL);
1200                                 
1201                         }
1202                         else {
1203                                 v3= v1;
1204                                 v4= v2;
1205                                 for(a=1; a<tot; a++) {
1206                                         addfacelist(em, vdown, v3, v3->next, 0, NULL, NULL);
1207                                         v3= v3->next;
1208                                         if(ext && fill) {
1209                                                 addfacelist(em, vtop, v4, v4->next, 0, NULL, NULL);
1210                                                 v4= v4->next;
1211                                         }
1212                                 }
1213                                 if(!ELEM(type, PRIM_PLANE, PRIM_CUBE)) {
1214                                         addfacelist(em, vdown, v3, v1, 0, NULL, NULL);
1215                                         if(ext) addfacelist(em, vtop, v4, v2, 0, NULL, NULL);
1216                                 }
1217                         }
1218                 }
1219                 else if(type==PRIM_CIRCLE) {  /* we need edges for a circle */
1220                         v3= v1;
1221                         for(a=1;a<tot;a++) {
1222                                 addedgelist(em, v3, v3->next, NULL);
1223                                 v3= v3->next;
1224                         }
1225                         addedgelist(em, v3, v1, NULL);
1226                 }
1227                 /* side faces */
1228                 if(ext) {
1229                         v3= v1;
1230                         v4= v2;
1231                         for(a=1; a<tot; a++) {
1232                                 addfacelist(em, v3, v3->next, v4->next, v4, NULL, NULL);
1233                                 v3= v3->next;
1234                                 v4= v4->next;
1235                         }
1236                         addfacelist(em, v3, v1, v2, v4, NULL, NULL);
1237                 }
1238                 else if(fill && type==PRIM_CONE) {
1239                         /* add the bottom flat area of the cone
1240                          * if capping is disabled dont bother */
1241                         v3= v1;
1242                         for(a=1; a<tot; a++) {
1243                                 addfacelist(em, vtop, v3->next, v3, 0, NULL, NULL);
1244                                 v3= v3->next;
1245                         }
1246                         addfacelist(em, vtop, v1, v3, 0, NULL, NULL);
1247                 }
1248         }
1249         
1250         EM_stats_update(em);
1251         /* simple selection flush OK, based on fact it's a single model */
1252         EM_select_flush(em); /* flushes vertex -> edge -> face selection */
1253         
1254         if(type!=PRIM_PLANE && type!=PRIM_MONKEY)
1255                 EM_recalc_normal_direction(em, 0, 0);   /* otherwise monkey has eyes in wrong direction */
1256
1257         BKE_mesh_end_editmesh(obedit->data, em);
1258 }
1259
1260 /* ********* add primitive operators ************* */
1261
1262 static char *get_mesh_defname(int type)
1263 {
1264         switch (type) {
1265                 case PRIM_PLANE: return "Plane";
1266                 case PRIM_CUBE: return "Cube";
1267                 case PRIM_CIRCLE: return "Circle";
1268                 case PRIM_CYLINDER: return "Tube";
1269                 case PRIM_CONE: return "Cone";
1270                 case PRIM_GRID: return "Grid";
1271                 case PRIM_UVSPHERE: return "Sphere";
1272                 case PRIM_ICOSPHERE: return "Icosphere";
1273                 case PRIM_MONKEY: return "Monkey";
1274                 default:
1275                         return "Mesh";
1276         }
1277 }
1278
1279 static void make_prim_ext(bContext *C, float *loc, float *rot, int enter_editmode, unsigned int layer, 
1280                 int type, int tot, int seg,
1281                 int subdiv, float dia, float depth, int ext, int fill)
1282 {
1283         Object *obedit= CTX_data_edit_object(C);
1284         int newob = 0;
1285         float mat[4][4];
1286         float scale;
1287
1288         if(obedit==NULL || obedit->type!=OB_MESH) {
1289                 obedit= ED_object_add_type(C, OB_MESH, loc, rot, FALSE, layer);
1290                 
1291                 rename_id((ID *)obedit, get_mesh_defname(type));
1292                 rename_id((ID *)obedit->data, get_mesh_defname(type));
1293                 
1294                 /* create editmode */
1295                 ED_object_enter_editmode(C, EM_DO_UNDO|EM_IGNORE_LAYER); /* rare cases the active layer is messed up */
1296                 newob = 1;
1297         }
1298         else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
1299
1300         scale= ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
1301
1302         dia *= scale;
1303         depth *= scale;
1304
1305         make_prim(obedit, type, mat, tot, seg, subdiv, dia, depth, ext, fill);
1306
1307         DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
1308         WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
1309
1310
1311         /* userdef */
1312         if (newob && !enter_editmode) {
1313                 ED_object_exit_editmode(C, EM_FREEDATA); /* adding EM_DO_UNDO messes up operator redo */
1314         }
1315         WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
1316 }
1317
1318 static int add_primitive_plane_exec(bContext *C, wmOperator *op)
1319 {
1320         int enter_editmode;
1321         unsigned int layer;
1322         float loc[3], rot[3];
1323         
1324         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1325                 return OPERATOR_CANCELLED;
1326
1327         /* sqrt(2.0f) - plane (diameter of 1.41 makes it unit size) */
1328         make_prim_ext(C, loc, rot, enter_editmode, layer,
1329                         PRIM_PLANE, 4, 0, 0, sqrt(2.0f), 0.0f, 0, 1);
1330         return OPERATOR_FINISHED;       
1331 }
1332
1333 void MESH_OT_primitive_plane_add(wmOperatorType *ot)
1334 {
1335         /* identifiers */
1336         ot->name= "Add Plane";
1337         ot->description= "Construct a filled planar mesh with 4 vertices";
1338         ot->idname= "MESH_OT_primitive_plane_add";
1339         
1340         /* api callbacks */
1341         ot->invoke= ED_object_add_generic_invoke;
1342         ot->exec= add_primitive_plane_exec;
1343         ot->poll= ED_operator_scene_editable;
1344         
1345         /* flags */
1346         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1347
1348         ED_object_add_generic_props(ot, TRUE);
1349 }
1350
1351 static int add_primitive_cube_exec(bContext *C, wmOperator *op)
1352 {
1353         int enter_editmode;
1354         unsigned int layer;
1355         float loc[3], rot[3];
1356         
1357         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1358                 return OPERATOR_CANCELLED;
1359
1360         /* sqrt(2.0f) - plane (diameter of 1.41 makes it unit size) */
1361         make_prim_ext(C, loc, rot, enter_editmode, layer,
1362                         PRIM_CUBE, 4, 0, 0, sqrt(2.0f), 1.0f, 1, 1);
1363         return OPERATOR_FINISHED;
1364 }
1365
1366 void MESH_OT_primitive_cube_add(wmOperatorType *ot)
1367 {
1368         /* identifiers */
1369         ot->name= "Add Cube";
1370         ot->description= "Construct a cube mesh";
1371         ot->idname= "MESH_OT_primitive_cube_add";
1372         
1373         /* api callbacks */
1374         ot->invoke= ED_object_add_generic_invoke;
1375         ot->exec= add_primitive_cube_exec;
1376         ot->poll= ED_operator_scene_editable;
1377         
1378         /* flags */
1379         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1380
1381         ED_object_add_generic_props(ot, TRUE);
1382 }
1383
1384 static int add_primitive_circle_exec(bContext *C, wmOperator *op)
1385 {
1386         int enter_editmode;
1387         unsigned int layer;
1388         float loc[3], rot[3];
1389         
1390         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1391                 return OPERATOR_CANCELLED;
1392
1393         make_prim_ext(C, loc, rot, enter_editmode, layer,
1394                         PRIM_CIRCLE, RNA_int_get(op->ptr, "vertices"), 0, 0,
1395                         RNA_float_get(op->ptr,"radius"), 0.0f, 0,
1396                         RNA_boolean_get(op->ptr, "fill"));
1397
1398         return OPERATOR_FINISHED;       
1399 }
1400
1401 void MESH_OT_primitive_circle_add(wmOperatorType *ot)
1402 {
1403         /* identifiers */
1404         ot->name= "Add Circle";
1405         ot->description= "Construct a circle mesh";
1406         ot->idname= "MESH_OT_primitive_circle_add";
1407         
1408         /* api callbacks */
1409         ot->invoke= ED_object_add_generic_invoke;
1410         ot->exec= add_primitive_circle_exec;
1411         ot->poll= ED_operator_scene_editable;
1412         
1413         /* flags */
1414         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1415         
1416         /* props */
1417         RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 3, 500);
1418         RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
1419         RNA_def_boolean(ot->srna, "fill", 0, "Fill", "");
1420
1421         ED_object_add_generic_props(ot, TRUE);
1422 }
1423
1424 static int add_primitive_tube_exec(bContext *C, wmOperator *op)
1425 {
1426         int enter_editmode;
1427         unsigned int layer;
1428         float loc[3], rot[3];
1429         
1430         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1431                 return OPERATOR_CANCELLED;
1432
1433         make_prim_ext(C, loc, rot, enter_editmode, layer,
1434                         PRIM_CYLINDER, RNA_int_get(op->ptr, "vertices"), 0, 0,
1435                         RNA_float_get(op->ptr,"radius"),
1436                         RNA_float_get(op->ptr, "depth"), 1, 
1437                         RNA_boolean_get(op->ptr, "cap_ends"));
1438
1439         return OPERATOR_FINISHED;
1440 }
1441
1442 void MESH_OT_primitive_tube_add(wmOperatorType *ot)
1443 {
1444         /* identifiers */
1445         ot->name= "Add Tube";
1446         ot->description= "Construct a tube mesh";
1447         ot->idname= "MESH_OT_primitive_tube_add";
1448         
1449         /* api callbacks */
1450         ot->invoke= ED_object_add_generic_invoke;
1451         ot->exec= add_primitive_tube_exec;
1452         ot->poll= ED_operator_scene_editable;
1453         
1454         /* flags */
1455         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1456         
1457         /* props */
1458         RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 2, 500);
1459         RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
1460         RNA_def_float(ot->srna, "depth", 1.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
1461         RNA_def_boolean(ot->srna, "cap_ends", 1, "Cap Ends", "");
1462
1463         ED_object_add_generic_props(ot, TRUE);
1464 }
1465
1466 static int add_primitive_cone_exec(bContext *C, wmOperator *op)
1467 {
1468         int enter_editmode;
1469         unsigned int layer;
1470         float loc[3], rot[3];
1471         
1472         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1473                 return OPERATOR_CANCELLED;
1474
1475         make_prim_ext(C, loc, rot, enter_editmode, layer,
1476                         PRIM_CONE, RNA_int_get(op->ptr, "vertices"), 0, 0,
1477                         RNA_float_get(op->ptr,"radius"), RNA_float_get(op->ptr, "depth"),
1478                         0, RNA_boolean_get(op->ptr, "cap_end"));
1479
1480         return OPERATOR_FINISHED;
1481 }
1482
1483 void MESH_OT_primitive_cone_add(wmOperatorType *ot)
1484 {
1485         /* identifiers */
1486         ot->name= "Add Cone";
1487         ot->description= "Construct a conic mesh (ends filled)";
1488         ot->idname= "MESH_OT_primitive_cone_add";
1489         
1490         /* api callbacks */
1491         ot->invoke= ED_object_add_generic_invoke;
1492         ot->exec= add_primitive_cone_exec;
1493         ot->poll= ED_operator_scene_editable;
1494         
1495         /* flags */
1496         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1497         
1498         /* props */
1499         RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 2, 500);
1500         RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
1501         RNA_def_float(ot->srna, "depth", 1.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
1502         RNA_def_boolean(ot->srna, "cap_end", 0, "Cap End", "");
1503
1504         ED_object_add_generic_props(ot, TRUE);
1505 }
1506
1507 static int add_primitive_grid_exec(bContext *C, wmOperator *op)
1508 {
1509         int enter_editmode;
1510         unsigned int layer;
1511         float loc[3], rot[3];
1512         
1513         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1514                 return OPERATOR_CANCELLED;
1515
1516         make_prim_ext(C, loc, rot, enter_editmode, layer,
1517                         PRIM_GRID, RNA_int_get(op->ptr, "x_subdivisions"),
1518                         RNA_int_get(op->ptr, "y_subdivisions"), 0,
1519                         RNA_float_get(op->ptr,"size"), 0.0f, 0, 1);
1520
1521         return OPERATOR_FINISHED;
1522 }
1523
1524 void MESH_OT_primitive_grid_add(wmOperatorType *ot)
1525 {
1526         /* identifiers */
1527         ot->name= "Add Grid";
1528         ot->description= "Construct a grid mesh";
1529         ot->idname= "MESH_OT_primitive_grid_add";
1530         
1531         /* api callbacks */
1532         ot->invoke= ED_object_add_generic_invoke;
1533         ot->exec= add_primitive_grid_exec;
1534         ot->poll= ED_operator_scene_editable;
1535         
1536         /* flags */
1537         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1538         
1539         /* props */
1540         RNA_def_int(ot->srna, "x_subdivisions", 10, INT_MIN, INT_MAX, "X Subdivisions", "", 3, 1000);
1541         RNA_def_int(ot->srna, "y_subdivisions", 10, INT_MIN, INT_MAX, "Y Subdivisions", "", 3, 1000);
1542         RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, FLT_MAX);
1543
1544         ED_object_add_generic_props(ot, TRUE);
1545 }
1546
1547 static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
1548 {
1549         int enter_editmode;
1550         unsigned int layer;
1551         float loc[3], rot[3];
1552         
1553         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1554                 return OPERATOR_CANCELLED;
1555
1556         make_prim_ext(C, loc, rot, enter_editmode, layer,
1557                         PRIM_MONKEY, 0, 0, 2, 0.0f, 0.0f, 0, 0);
1558
1559         return OPERATOR_FINISHED;
1560 }
1561
1562 void MESH_OT_primitive_monkey_add(wmOperatorType *ot)
1563 {
1564         /* identifiers */
1565         ot->name= "Add Monkey";
1566         ot->description= "Construct a Suzanne mesh";
1567         ot->idname= "MESH_OT_primitive_monkey_add";
1568         
1569         /* api callbacks */
1570         ot->invoke= ED_object_add_generic_invoke;
1571         ot->exec= add_primitive_monkey_exec;
1572         ot->poll= ED_operator_scene_editable;
1573         
1574         /* flags */
1575         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1576
1577         ED_object_add_generic_props(ot, TRUE);
1578 }
1579
1580 static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
1581 {
1582         int enter_editmode;
1583         unsigned int layer;
1584         float loc[3], rot[3];
1585         
1586         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1587                 return OPERATOR_CANCELLED;
1588
1589         make_prim_ext(C, loc, rot, enter_editmode, layer,
1590                         PRIM_UVSPHERE, RNA_int_get(op->ptr, "ring_count"),
1591                         RNA_int_get(op->ptr, "segments"), 0,
1592                         RNA_float_get(op->ptr,"size"), 0.0f, 0, 0);
1593
1594         return OPERATOR_FINISHED;       
1595 }
1596
1597 void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
1598 {
1599         /* identifiers */
1600         ot->name= "Add UV Sphere";
1601         ot->description= "Construct a UV sphere mesh";
1602         ot->idname= "MESH_OT_primitive_uv_sphere_add";
1603         
1604         /* api callbacks */
1605         ot->invoke= ED_object_add_generic_invoke;
1606         ot->exec= add_primitive_uvsphere_exec;
1607         ot->poll= ED_operator_scene_editable;
1608         
1609         /* flags */
1610         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1611         
1612         /* props */
1613         RNA_def_int(ot->srna, "segments", 32, INT_MIN, INT_MAX, "Segments", "", 3, 500);
1614         RNA_def_int(ot->srna, "ring_count", 16, INT_MIN, INT_MAX, "Rings", "", 3, 500);
1615         RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00);
1616
1617         ED_object_add_generic_props(ot, TRUE);
1618 }
1619
1620 static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
1621 {
1622         int enter_editmode;
1623         unsigned int layer;
1624         float loc[3], rot[3];
1625         
1626         if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
1627                 return OPERATOR_CANCELLED;
1628
1629         make_prim_ext(C, loc, rot, enter_editmode, layer,
1630                         PRIM_ICOSPHERE, 0, 0, RNA_int_get(op->ptr, "subdivisions"),
1631                         RNA_float_get(op->ptr,"size"), 0.0f, 0, 0);
1632
1633         return OPERATOR_FINISHED;       
1634 }
1635
1636 void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot)
1637 {
1638         /* identifiers */
1639         ot->name= "Add Ico Sphere";
1640         ot->description= "Construct an Icosphere mesh";
1641         ot->idname= "MESH_OT_primitive_ico_sphere_add";
1642         
1643         /* api callbacks */
1644         ot->invoke= ED_object_add_generic_invoke;
1645         ot->exec= add_primitive_icosphere_exec;
1646         ot->poll= ED_operator_scene_editable;
1647         
1648         /* flags */
1649         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1650         
1651         /* props */
1652         RNA_def_int(ot->srna, "subdivisions", 2, 0, INT_MAX, "Subdivisions", "", 0, 8);
1653         RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00);
1654
1655         ED_object_add_generic_props(ot, TRUE);
1656 }
1657
1658 /****************** add duplicate operator ***************/
1659
1660 static int mesh_duplicate_exec(bContext *C, wmOperator *op)
1661 {
1662         Object *ob= CTX_data_edit_object(C);
1663         EditMesh *em= BKE_mesh_get_editmesh(ob->data);
1664
1665         adduplicateflag(em, SELECT);
1666
1667         BKE_mesh_end_editmesh(ob->data, em);
1668
1669         DAG_id_flush_update(ob->data, OB_RECALC_DATA);
1670         WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
1671         
1672         return OPERATOR_FINISHED;
1673 }
1674
1675 static int mesh_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
1676 {
1677         WM_cursor_wait(1);
1678         mesh_duplicate_exec(C, op);
1679         WM_cursor_wait(0);
1680         
1681         return OPERATOR_FINISHED;
1682 }
1683
1684 void MESH_OT_duplicate(wmOperatorType *ot)
1685 {
1686         /* identifiers */
1687         ot->name= "Duplicate";
1688         ot->description= "Duplicate selected vertices, edges or faces";
1689         ot->idname= "MESH_OT_duplicate";
1690         
1691         /* api callbacks */
1692         ot->invoke= mesh_duplicate_invoke;
1693         ot->exec= mesh_duplicate_exec;
1694         
1695         ot->poll= ED_operator_editmesh;
1696         
1697         /* to give to transform */
1698         RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
1699 }
1700