← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/src/editmesh_lib.c

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/src/editmesh_lib.c
190
190
                we need the plane for this */
191
191
                Crossf(vec, normal, plane);
192
192
                Crossf(normal, plane, vec); 
193
 
                Normalise(normal);
 
193
                Normalize(normal);
194
194
                
195
195
        } else if (ese->type==EDITFACE) {
196
196
                EditFace *efa= ese->data;
263
263
                                VecCopyf(plane, vec);
264
264
                }
265
265
        }
266
 
        Normalise(plane);
 
266
        Normalize(plane);
267
267
}
268
268
 
269
269
 
1013
1013
                        }
1014
1014
                }
1015
1015
        }
1016
 
        Normalise(nor);
 
1016
        Normalize(nor);
1017
1017
        
1018
1018
        /* set correct selection */
1019
1019
        EM_clear_flag_all(SELECT);
1279
1279
                }
1280
1280
        }
1281
1281
        
1282
 
        Normalise(nor); // translation normal grab
 
1282
        Normalize(nor); // translation normal grab
1283
1283
        
1284
1284
        /* step 7: redo selection */
1285
1285
        EM_clear_flag_all(SELECT);
1480
1480
                        if(eed->dir != del_old) 
1481
1481
                                efa2 = addfacelist(eed->v1, eed->v2, 
1482
1482
                                                                  eed->v2->tmp.v, eed->v1->tmp.v, 
1483
 
                                                                  NULL, NULL);
 
1483
                                                                  eed->tmp.f, NULL);
1484
1484
                        else 
1485
1485
                                efa2 = addfacelist(eed->v2, eed->v1, 
1486
1486
                                                                   eed->v1->tmp.v, eed->v2->tmp.v, 
1487
 
                                                                   NULL, NULL);
1488
 
                        
1489
 
                        if(eed->tmp.f) {
1490
 
                                efa = eed->tmp.f;
1491
 
                                efa2->mat_nr= efa->mat_nr;
1492
 
                                efa2->flag= efa->flag;
1493
 
                                CustomData_em_copy_data(&em->fdata, &em->fdata, &efa->data, &efa2->data);
1494
 
                        }
 
1487
                                                                   eed->tmp.f, NULL);
1495
1488
                        
1496
1489
                        /* Needs smarter adaption of existing creases.
1497
1490
                         * If addedgelist is used, make sure seams are set to 0 on these
1547
1540
                efa= nextvl;
1548
1541
        }
1549
1542
        
1550
 
        Normalise(nor); // for grab
 
1543
        Normalize(nor); // for grab
1551
1544
        
1552
1545
        /* for all vertices with eve->tmp.v!=0 
1553
1546
                if eve->f1==1: make edge
1860
1853
 
1861
1854
        /* following Mesh convention; we use vertex coordinate itself for normal in this case */
1862
1855
        for(eve= em->verts.first; eve; eve=eve->next) {
1863
 
                if (Normalise(eve->no)==0.0) {
 
1856
                if (Normalize(eve->no)==0.0) {
1864
1857
                        VECCOPY(eve->no, eve->co);
1865
 
                        Normalise(eve->no);
 
1858
                        Normalize(eve->no);
1866
1859
                }
1867
1860
        }
1868
1861
}