[Bf-blender-cvs] CVS commit: blender/source/blender/include BIF_editmesh.h blender/source/blender/src edit.c editmesh_tools.c header_view3d.c toolbox.c

[Geoffrey Bantle]

briggs (Geoffrey  Bantle) 2006/05/29 07:17:38 CEST

  Modified files:
    blender/source/blender/include BIF_editmesh.h 
    blender/source/blender/src edit.c editmesh_tools.c 
                               header_view3d.c toolbox.c 
  
  Log:
  -> UV Edge collapse
  
  Added code to make 'Collapse Edges' handle UV's intelligently. This seems to work in just about every case that I can test, so it's turned on by default.
  
  Also completely removed the 'collapse faces' command and code. I'm not sure what I was thinking with this in the first place since edge collapse does the same job while in in face mode. Because of this there is now just one single command that covers both situations called 'Collapse' which uses the edge collapse code.
  
  Revision  Changes    Path
  1.66      +2 -3      blender/source/blender/include/BIF_editmesh.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_editmesh.h.diff?r1=1.65&r2=1.66&cvsroot=bf-blender>
  1.88      +8 -15     blender/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/edit.c.diff?r1=1.87&r2=1.88&cvsroot=bf-blender>
  1.147     +248 -179  blender/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editmesh_tools.c.diff?r1=1.146&r2=1.147&cvsroot=bf-blender>
  1.170     +5 -10     blender/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_view3d.c.diff?r1=1.169&r2=1.170&cvsroot=bf-blender>
  1.131     +2 -3      blender/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/toolbox.c.diff?r1=1.130&r2=1.131&cvsroot=bf-blender>