[tuhopuu-cvs] CVS commit: tuhopuu2/source/blender/blenkernel/intern ipo.c tuhopuu2/source/blender/src buttons_object.c buttons_scene.c drawipo.c drawview.c editaction.c editmesh.c editnla.c editsound.c

[Chris Want]

hos (Chris Want) 2004/08/03 06:16:36 CEST

  Modified files:
    tuhopuu2/source/blender/blenkernel/intern ipo.c 
    tuhopuu2/source/blender/src buttons_object.c buttons_scene.c 
                                drawipo.c drawview.c editaction.c 
                                editmesh.c editnla.c editsound.c 
  
  Log:
  The first set of post-merge fixes to get blender compiled.
  
  Unfortunately, I've run out of time this evening to address all
  of the problems, but I hope to start again tomorrow evening.
  
  People who can't wait for me to get this stuff compiling are
  welcome to fix stuff too.
  
  Revision  Changes    Path
  1.10      +1 -3      tuhopuu2/source/blender/blenkernel/intern/ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/ipo.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.20      +5 -23     tuhopuu2/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_object.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.19      +1 -1      tuhopuu2/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_scene.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.6       +1 -5      tuhopuu2/source/blender/src/drawipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawipo.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.19      +2 -2      tuhopuu2/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawview.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.10      +74 -49    tuhopuu2/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editaction.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.110     +4 -2      tuhopuu2/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editmesh.c.diff?r1=1.109&r2=1.110&cvsroot=tuhopuu>
  1.12      +25 -61    tuhopuu2/source/blender/src/editnla.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editnla.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.5       +25 -55    tuhopuu2/source/blender/src/editsound.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editsound.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>