[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel/intern font.c material.c blender/source/blender/src editfont.c buttons_editing.c blender/source/blender/blenloader/intern readfile.c

Alexander Ewering blender at instinctive.de
Sun Jun 26 00:51:51 CEST 2005


intrr (Alexander Ewering) 2005/06/26 00:51:51 CEST

  Modified files:
    blender/source/blender/blenkernel/intern font.c material.c 
    blender/source/blender/src editfont.c buttons_editing.c 
    blender/source/blender/blenloader/intern readfile.c 
  
  Log:
  The overlapping curves/material indices problem got a bit out of control.
  
   - For avoiding the 'overlapping character problem' in Text objects, I had
     changed the sorting code for filling nurbs to use nu->charidx (a new
     variable incremented with each new character) instead of nu->mat_nr
     (which used to work for material indices inside a 2D Curve).
  
   - This broke material indices in normal 2D Curves completely, thus:
  
   - nu->charidx is now not only used for seperating
     characters in text objects for filling, but also for normal 2D curves
     when they contain material indices. In fact, charidx is just set to
     the material index.
  
   - There's compatibility code in readfile.c that sets nu->charidx to nu->mat_nr
     when reading curves from files that are not text objects
  
   - So, the big conclusion: Instead of using material indices for creating
     'filling groups', filldisplist() now uses nu->charidx, which is set
     appropriately when reading old files and assigning/deleting material
     indices in curves.
  
   - This is all pretty obscure and hard to explain. If I haven't been clear,
     ask.
  
   - If it breaks anything, complain!
  
  Revision  Changes    Path
  1.17      +2 -2      blender/source/blender/blenkernel/intern/font.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/font.c.diff?r1=1.16&r2=1.17&cvsroot=bf-blender>
  1.27      +5 -2      blender/source/blender/blenkernel/intern/material.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/material.c.diff?r1=1.26&r2=1.27&cvsroot=bf-blender>
  1.26      +3 -3      blender/source/blender/src/editfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editfont.c.diff?r1=1.25&r2=1.26&cvsroot=bf-blender>
  1.118     +1 -1      blender/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_editing.c.diff?r1=1.117&r2=1.118&cvsroot=bf-blender>
  1.133     +2 -1      blender/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/readfile.c.diff?r1=1.132&r2=1.133&cvsroot=bf-blender>



More information about the Bf-blender-cvs mailing list